diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt index f2ef64e..7ee300e 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt @@ -1,7 +1,6 @@ package de.bixilon.pixlyzer.generator import de.bixilon.pixlyzer.generator.generators.* -import de.bixilon.pixlyzer.generator.generators.enums.BiomePrecipitationsGenerator import de.bixilon.pixlyzer.generator.generators.enums.EnchantmentTargetsGenerator import de.bixilon.pixlyzer.generator.generators.variants.CatVariantGenerator import de.bixilon.pixlyzer.generator.generators.variants.FrogVariantGenerator @@ -42,7 +41,6 @@ object Generators { PointOfInterestGenerator, VillagerProfessionGenerator, SoundEventGenerator, - BiomePrecipitationsGenerator, EnchantmentTargetsGenerator, diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt index 0983ff7..aa5456f 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt @@ -35,14 +35,14 @@ object BiomeGenerator : Generator( val climateParameters = CLIMATE_PARAMETERS_FIELD?.get(biome) ?: biome - (PRECIPITATION_FIELD.get(climateParameters) as Enum<*>?)?.ordinal?.let { + (PRECIPITATION_FIELD!!.get(climateParameters) as Enum<*>?)?.ordinal?.let { biomeData["precipitation"] = it } - biomeData["temperature"] = TEMPERATURE_FIELD.getFloat(climateParameters) + biomeData["temperature"] = TEMPERATURE_FIELD!!.getFloat(climateParameters) (TEMPERATURE_MODIFIER_FIELD?.get(climateParameters) as Enum<*>?)?.let { biomeData["temperature_modifier"] = it.name } - biomeData["downfall"] = DOWNFALL_FIELD.getFloat(climateParameters) + biomeData["downfall"] = DOWNFALL_FIELD!!.getFloat(climateParameters) getField(Biome::class.java, "effects")?.get(biome)?.let { @@ -156,10 +156,10 @@ object BiomeGenerator : Generator( private val CLIMATE_PARAMETERS_FIELD = getField(Biome::class.java, "weather", "climateSettings") - private val PRECIPITATION_FIELD = getField(CLIMATE_SETTINGS_CLASS, "precipitation")!! - private val TEMPERATURE_FIELD = getField(CLIMATE_SETTINGS_CLASS, "temperature", "baseTemperature")!! + private val PRECIPITATION_FIELD = getField(CLIMATE_SETTINGS_CLASS, "precipitation") + private val TEMPERATURE_FIELD = getField(CLIMATE_SETTINGS_CLASS, "temperature", "baseTemperature") private val TEMPERATURE_MODIFIER_FIELD = getField(CLIMATE_SETTINGS_CLASS, "temperatureModifier") - private val DOWNFALL_FIELD = getField(CLIMATE_SETTINGS_CLASS, "downfall")!! + private val DOWNFALL_FIELD = getField(CLIMATE_SETTINGS_CLASS, "downfall") private val BIOME_SKY_COLOR_FIELD = getField(Biome::class.java, "field_21806", "skyColor") diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VersionGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VersionGenerator.kt index 8783c55..fc89116 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VersionGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/VersionGenerator.kt @@ -5,7 +5,8 @@ import de.bixilon.pixlyzer.generator.Generator import net.minecraft.MinecraftVersion object VersionGenerator : Generator( - "version" + "version", + allowedFail = true, ) { override fun generate() { val version = MinecraftVersion::class.java.getDeclaredMethod("create").invoke(null) as GameVersion diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/enums/BiomePrecipitationsGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/enums/BiomePrecipitationsGenerator.kt deleted file mode 100644 index 1d87c14..0000000 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/enums/BiomePrecipitationsGenerator.kt +++ /dev/null @@ -1,19 +0,0 @@ -package de.bixilon.pixlyzer.generator.generators.enums - -import de.bixilon.pixlyzer.generator.Generator -import de.bixilon.pixlyzer.util.Util.compound -import net.minecraft.world.biome.Biome - -object BiomePrecipitationsGenerator : Generator( - "biome_precipitations" -) { - override fun generate() { - for (biomeCategory in Biome.Precipitation.values()) { - val biomeCategoryData = compound() - biomeCategoryData["name"] = biomeCategory.name - - data[biomeCategory.ordinal] = biomeCategoryData - } - } - -}