Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-22 19:58:34 +01:00
Code Issues Projects Releases Wiki Activity

run config later and validate some stuff in an attempt to address #116

Browse source
This commit is contained in:
Ellpeck 2020-05-12 14:24:50 +02:00
parent c87bcca0d9
commit 7f4d6da0a6
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/de/ellpeck/naturesaura/ModConfig.java
View file

@ -16,6 +16,7 @@ import net.minecraftforge.registries.ForgeRegistries;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
public final class ModConfig { public final class ModConfig {
@ -173,8 +174,8 @@ public final class ModConfig {
for (String s : this.additionalBotanistPickaxeConversions.get()) { for (String s : this.additionalBotanistPickaxeConversions.get()) {
String[] split = s.split("->"); String[] split = s.split("->");
NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put( NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put(
Helper.getStateFromString(split[0]), Objects.requireNonNull(Helper.getStateFromString(split[0]), "state1"),
Helper.getStateFromString(split[1])); Objects.requireNonNull(Helper.getStateFromString(split[1]), "state2"));
} }
} catch (Exception e) { } catch (Exception e) {
NaturesAura.LOGGER.warn("Error parsing additionalBotanistPickaxeConversions", e); NaturesAura.LOGGER.warn("Error parsing additionalBotanistPickaxeConversions", e);
@ -183,9 +184,9 @@ public final class ModConfig {
try { try {
for (String s : this.auraTypeOverrides.get()) { for (String s : this.auraTypeOverrides.get()) {
String[] split = s.split("->"); String[] split = s.split("->");
IAuraType type = NaturesAuraAPI.AURA_TYPES.get(new ResourceLocation(split[1])); DimensionType dim = Objects.requireNonNull(DimensionType.byName(new ResourceLocation(split[0])), "dim");
if (type instanceof BasicAuraType) BasicAuraType type = Objects.requireNonNull((BasicAuraType) NaturesAuraAPI.AURA_TYPES.get(new ResourceLocation(split[1])), "type");
((BasicAuraType) type).addDimensionType(DimensionType.byName(new ResourceLocation(split[0]))); type.addDimensionType(dim);
} }
} catch (Exception e) { } catch (Exception e) {
NaturesAura.LOGGER.warn("Error parsing auraTypeOverrides", e); NaturesAura.LOGGER.warn("Error parsing auraTypeOverrides", e);
@ -196,10 +197,13 @@ public final class ModConfig {
String[] split = s.split(":"); String[] split = s.split(":");
WeightedOre ore = new WeightedOre(new ResourceLocation(split[0]), Integer.parseInt(split[1])); WeightedOre ore = new WeightedOre(new ResourceLocation(split[0]), Integer.parseInt(split[1]));
String dimension = split[2]; String dimension = split[2];
if ("nether".equalsIgnoreCase(dimension)) if ("nether".equalsIgnoreCase(dimension)) {
NaturesAuraAPI.NETHER_ORES.add(ore); NaturesAuraAPI.NETHER_ORES.add(ore);
else } else if ("overworld".equalsIgnoreCase(dimension)) {
NaturesAuraAPI.OVERWORLD_ORES.add(ore); NaturesAuraAPI.OVERWORLD_ORES.add(ore);
} else {
throw new IllegalArgumentException(dimension);
}
} }
} catch (Exception e) { } catch (Exception e) {
NaturesAura.LOGGER.warn("Error parsing additionalOres", e); NaturesAura.LOGGER.warn("Error parsing additionalOres", e);
@ -207,7 +211,7 @@ public final class ModConfig {
try { try {
for (String s : this.oreExceptions.get()) for (String s : this.oreExceptions.get())
OreSpawnEffect.SPAWN_EXCEPTIONS.add(Helper.getStateFromString(s)); OreSpawnEffect.SPAWN_EXCEPTIONS.add(Objects.requireNonNull(Helper.getStateFromString(s)));
} catch (Exception e) { } catch (Exception e) {
NaturesAura.LOGGER.warn("Error parsing oreExceptions", e); NaturesAura.LOGGER.warn("Error parsing oreExceptions", e);
} }
@ -216,7 +220,7 @@ public final class ModConfig {
for (String s : this.additionalProjectiles.get()) { for (String s : this.additionalProjectiles.get()) {
String[] split = s.split("->"); String[] split = s.split("->");
ResourceLocation name = new ResourceLocation(split[0]); ResourceLocation name = new ResourceLocation(split[0]);
EntityType type = ForgeRegistries.ENTITIES.getValue(name); EntityType<?> type = Objects.requireNonNull(ForgeRegistries.ENTITIES.getValue(name));
int amount = Integer.parseInt(split[1]); int amount = Integer.parseInt(split[1]);
NaturesAuraAPI.PROJECTILE_GENERATIONS.put(type, amount); NaturesAuraAPI.PROJECTILE_GENERATIONS.put(type, amount);
} }

2
src/main/java/de/ellpeck/naturesaura/NaturesAura.java
View file

@ -78,7 +78,7 @@ public final class NaturesAura {
} }
private void init(FMLCommonSetupEvent event) { private void init(FMLCommonSetupEvent event) {
ModConfig.instance.apply(); DeferredWorkQueue.runLater(ModConfig.instance::apply);
ModRecipes.init(); ModRecipes.init();
ModRegistry.init(); ModRegistry.init();