diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt b/src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt index b04c8a129..b00539f9b 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt @@ -32,14 +32,13 @@ data class Biome( val waterColor: RGBColor?, val waterFogColor: RGBColor?, val category: BiomeCategory, - val precipation: BiomePrecipation, + val precipitation: BiomePrecipitation, val skyColor: RGBColor, val foliageColor: RGBColor?, val grassColor: RGBColor?, val descriptionId: String?, val grassColorModifier: GrassColorModifiers = GrassColorModifiers.NONE, ) : RegistryItem { - val temperatureColorMapCoordinate = getColorMapCoordinate(temperature) val downfallColorMapCoordinate = getColorMapCoordinate(downfall * temperature) @@ -66,7 +65,7 @@ data class Biome( waterColor = TintColorCalculator.getJsonColor(data["water_color"]?.asInt ?: 0), waterFogColor = TintColorCalculator.getJsonColor(data["water_fog_color"]?.asInt ?: 0), category = mappings.biomeCategoryRegistry.get(data["category"]?.asInt ?: -1) ?: DEFAULT_CATEGORY, - precipation = mappings.biomePrecipitationRegistry.get(data["precipitation"]?.asInt ?: -1) ?: DEFAULT_PRECIPATION, + precipitation = mappings.biomePrecipitationRegistry.get(data["precipitation"]?.asInt ?: -1) ?: DEFAULT_PRECIPITATION, skyColor = data["sky_color"]?.asInt?.let { RGBColor.noAlpha(it) } ?: RenderConstants.GRASS_FAILOVER_COLOR, foliageColor = TintColorCalculator.getJsonColor(data["foliage_color_override"]?.asInt ?: data["foliage_color"]?.asInt ?: 0), grassColor = TintColorCalculator.getJsonColor(data["grass_color_override"]?.asInt ?: 0), @@ -80,14 +79,14 @@ data class Biome( ) } - private val DEFAULT_PRECIPATION = BiomePrecipation("NONE") + private val DEFAULT_PRECIPITATION = BiomePrecipitation("NONE") private val DEFAULT_CATEGORY = BiomeCategory("NONE") } enum class GrassColorModifiers(val modifier: (color: RGBColor) -> RGBColor) { NONE({ color: RGBColor -> color }), - DARK_FOREST({ color: RGBColor -> RGBColor(color.color + 2634762 shl 8) }), + DARK_FOREST({ color: RGBColor -> color }), // ToDo: This rgb 2634762 should be added to this? SWAMP({ // ToDo: Minecraft uses PerlinSimplexNoise here RGBColor("#6A7039") diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipation.kt b/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipation.kt rename to src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt index 0197cf69a..223e5873d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipation.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt @@ -18,13 +18,13 @@ import de.bixilon.minosoft.data.mappings.IdDeserializer import de.bixilon.minosoft.data.mappings.RegistryEnumable import de.bixilon.minosoft.data.mappings.versions.VersionMapping -data class BiomePrecipation( +data class BiomePrecipitation( override val name: String, ) : RegistryEnumable { - companion object : IdDeserializer { - override fun deserialize(mappings: VersionMapping, data: JsonObject): BiomePrecipation { - return BiomePrecipation( + companion object : IdDeserializer { + override fun deserialize(mappings: VersionMapping, data: JsonObject): BiomePrecipitation { + return BiomePrecipitation( name = data["name"].asString ) } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt index ceadb2a6d..b9a051175 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt @@ -21,7 +21,7 @@ import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.mappings.* import de.bixilon.minosoft.data.mappings.biomes.Biome import de.bixilon.minosoft.data.mappings.biomes.BiomeCategory -import de.bixilon.minosoft.data.mappings.biomes.BiomePrecipation +import de.bixilon.minosoft.data.mappings.biomes.BiomePrecipitation import de.bixilon.minosoft.data.mappings.blocks.Block import de.bixilon.minosoft.data.mappings.blocks.BlockState import de.bixilon.minosoft.data.mappings.items.ItemRegistry @@ -47,7 +47,7 @@ class VersionMapping(var version: Version?) { val dimensionRegistry: Registry = Registry() val materialRegistry: Registry = Registry() - val biomePrecipitationRegistry: EnumRegistry = EnumRegistry() + val biomePrecipitationRegistry: EnumRegistry = EnumRegistry() val biomeCategoryRegistry: EnumRegistry = EnumRegistry() @@ -108,7 +108,7 @@ class VersionMapping(var version: Version?) { // id stuff biomeCategoryRegistry.initialize(pixlyzerData["biome_categories"]?.asJsonObject, this, BiomeCategory.Companion) - biomePrecipitationRegistry.initialize(pixlyzerData["biome_precipations"]?.asJsonObject, this, BiomePrecipation.Companion) + biomePrecipitationRegistry.initialize(pixlyzerData["biome_precipations"]?.asJsonObject, this, BiomePrecipitation.Companion) // id resource location stuff materialRegistry.initialize(pixlyzerData["materials"]?.asJsonObject, this, Material.Companion)