AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 10:55:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix typo, fix dark forest tinting

Browse Source
This commit is contained in:
Bixilon 2021-03-15 16:17:24 +01:00
parent 0161e4ef29
commit 701e33621a
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt
View File

@ -32,14 +32,13 @@ data class Biome(
val waterColor: RGBColor?, val waterColor: RGBColor?,
val waterFogColor: RGBColor?, val waterFogColor: RGBColor?,
val category: BiomeCategory, val category: BiomeCategory,
val precipation: BiomePrecipation, val precipitation: BiomePrecipitation,
val skyColor: RGBColor, val skyColor: RGBColor,
val foliageColor: RGBColor?, val foliageColor: RGBColor?,
val grassColor: RGBColor?, val grassColor: RGBColor?,
val descriptionId: String?, val descriptionId: String?,
val grassColorModifier: GrassColorModifiers = GrassColorModifiers.NONE, val grassColorModifier: GrassColorModifiers = GrassColorModifiers.NONE,
) : RegistryItem { ) : RegistryItem {
val temperatureColorMapCoordinate = getColorMapCoordinate(temperature) val temperatureColorMapCoordinate = getColorMapCoordinate(temperature)
val downfallColorMapCoordinate = getColorMapCoordinate(downfall * temperature) val downfallColorMapCoordinate = getColorMapCoordinate(downfall * temperature)
@ -66,7 +65,7 @@ data class Biome(
waterColor = TintColorCalculator.getJsonColor(data["water_color"]?.asInt ?: 0), waterColor = TintColorCalculator.getJsonColor(data["water_color"]?.asInt ?: 0),
waterFogColor = TintColorCalculator.getJsonColor(data["water_fog_color"]?.asInt ?: 0), waterFogColor = TintColorCalculator.getJsonColor(data["water_fog_color"]?.asInt ?: 0),
category = mappings.biomeCategoryRegistry.get(data["category"]?.asInt ?: -1) ?: DEFAULT_CATEGORY, 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, 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), foliageColor = TintColorCalculator.getJsonColor(data["foliage_color_override"]?.asInt ?: data["foliage_color"]?.asInt ?: 0),
grassColor = TintColorCalculator.getJsonColor(data["grass_color_override"]?.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") private val DEFAULT_CATEGORY = BiomeCategory("NONE")
} }
enum class GrassColorModifiers(val modifier: (color: RGBColor) -> RGBColor) { enum class GrassColorModifiers(val modifier: (color: RGBColor) -> RGBColor) {
NONE({ color: RGBColor -> color }), 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({ SWAMP({
// ToDo: Minecraft uses PerlinSimplexNoise here // ToDo: Minecraft uses PerlinSimplexNoise here
RGBColor("#6A7039") RGBColor("#6A7039")

8
src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipation.kt → src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt
View File

@ -18,13 +18,13 @@ import de.bixilon.minosoft.data.mappings.IdDeserializer
import de.bixilon.minosoft.data.mappings.RegistryEnumable import de.bixilon.minosoft.data.mappings.RegistryEnumable
import de.bixilon.minosoft.data.mappings.versions.VersionMapping import de.bixilon.minosoft.data.mappings.versions.VersionMapping
data class BiomePrecipation( data class BiomePrecipitation(
override val name: String, override val name: String,
) : RegistryEnumable { ) : RegistryEnumable {
companion object : IdDeserializer<BiomePrecipation> { companion object : IdDeserializer<BiomePrecipitation> {
override fun deserialize(mappings: VersionMapping, data: JsonObject): BiomePrecipation { override fun deserialize(mappings: VersionMapping, data: JsonObject): BiomePrecipitation {
return BiomePrecipation( return BiomePrecipitation(
name = data["name"].asString name = data["name"].asString
) )
} }

6
src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt
View File

@ -21,7 +21,7 @@ import de.bixilon.minosoft.data.entities.entities.Entity
import de.bixilon.minosoft.data.mappings.* import de.bixilon.minosoft.data.mappings.*
import de.bixilon.minosoft.data.mappings.biomes.Biome import de.bixilon.minosoft.data.mappings.biomes.Biome
import de.bixilon.minosoft.data.mappings.biomes.BiomeCategory 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.Block
import de.bixilon.minosoft.data.mappings.blocks.BlockState import de.bixilon.minosoft.data.mappings.blocks.BlockState
import de.bixilon.minosoft.data.mappings.items.ItemRegistry import de.bixilon.minosoft.data.mappings.items.ItemRegistry
@ -47,7 +47,7 @@ class VersionMapping(var version: Version?) {
val dimensionRegistry: Registry<Dimension> = Registry() val dimensionRegistry: Registry<Dimension> = Registry()
val materialRegistry: Registry<Material> = Registry() val materialRegistry: Registry<Material> = Registry()
val biomePrecipitationRegistry: EnumRegistry<BiomePrecipation> = EnumRegistry() val biomePrecipitationRegistry: EnumRegistry<BiomePrecipitation> = EnumRegistry()
val biomeCategoryRegistry: EnumRegistry<BiomeCategory> = EnumRegistry() val biomeCategoryRegistry: EnumRegistry<BiomeCategory> = EnumRegistry()
@ -108,7 +108,7 @@ class VersionMapping(var version: Version?) {
// id stuff // id stuff
biomeCategoryRegistry.initialize(pixlyzerData["biome_categories"]?.asJsonObject, this, BiomeCategory.Companion) 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 // id resource location stuff
materialRegistry.initialize(pixlyzerData["materials"]?.asJsonObject, this, Material.Companion) materialRegistry.initialize(pixlyzerData["materials"]?.asJsonObject, this, Material.Companion)