This commit is contained in:
Bixilon 2023-01-18 23:29:32 +01:00
parent 7c34dcf900
commit 34d80dab9f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 8 additions and 28 deletions

View File

@ -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,

View File

@ -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")

View File

@ -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

View File

@ -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
}
}
}