From e215afb42b5cee5b6e95959c3aa6fce618ab9598 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 24 Feb 2021 22:29:14 +0100 Subject: [PATCH] rendering: tint: color lily pad, sugar canes, plants --- .../de/bixilon/minosoft/gui/rendering/RenderConstants.kt | 3 +++ .../bixilon/minosoft/gui/rendering/TintColorCalculator.kt | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt index 45c32aa5d..dbc00a6f9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt @@ -24,5 +24,8 @@ object RenderConstants { val GRASS_OUT_OF_BOUNDS_COLOR = RGBColor(-65281) + val LILY_PAD_INVENTORY_COLOR = RGBColor("#71C35C") + val LILY_PAD_BLOCK_COLOR = RGBColor("#208030") + const val COLORMAP_SIZE = 255 } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt index b9b295215..2f5a6118a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt @@ -30,7 +30,7 @@ class TintColorCalculator { fun calculateTint(tint: ResourceLocation, biome: Biome): RGBColor? { return when (tint) { ResourceLocation("water_tint") -> biome.waterColor - ResourceLocation("grass_tint") -> { + ResourceLocation("grass_tint"), ResourceLocation("sugar_cane_tint"), ResourceLocation("shearing_double_plant_tint") -> { val colorMapPixelIndex = biome.downfallColorMapCoordinate shl 8 or biome.temperatureColorMapCoordinate var color = if (colorMapPixelIndex > grassColorMap.size) { RenderConstants.GRASS_OUT_OF_BOUNDS_COLOR @@ -42,12 +42,10 @@ class TintColorCalculator { } biome.grassColorModifier.modifier.invoke(color) } - ResourceLocation("shearing_double_plant_tint") -> RGBColor("#456789") ResourceLocation("foliage_tint") -> { foliageColorMap[biome.downfallColorMapCoordinate shl 8 or biome.temperatureColorMapCoordinate] } - ResourceLocation("sugar_cane_tint") -> RGBColor("#654321") - ResourceLocation("lily_pad_tint") -> RGBColor("#987654") + ResourceLocation("lily_pad_tint") -> RenderConstants.LILY_PAD_BLOCK_COLOR else -> null } }