Make all liquids tint-able through the blockColors.json

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/map/hires/block/BlockStateModelRenderer.java

@@ -71,7 +71,7 @@ public void render(BlockNeighborhood block, BlockState blockState, TileModelView
         // add water if block is waterlogged
         if (blockState.isWaterlogged() || block.getProperties().isAlwaysWaterlogged()) {
             waterloggedColor.set(0f, 0f, 0f, 0f, true);
-            renderModel(block, WATERLOGGED_BLOCKSTATE, tileModel.initialize(), waterloggedColor);
+            renderModel(block, BlockState.WATER, tileModel.initialize(), waterloggedColor);
             blockColor.set(waterloggedColor.overlay(blockColor.premultiplied()));
         }
 
@@ -110,6 +110,4 @@ private void renderModel(BlockNeighborhood block, BlockState blockState, TileMod
         tileModel.initialize(modelStart);
     }
 
-    private final static BlockState WATERLOGGED_BLOCKSTATE = new BlockState(Key.minecraft("water"));
-
 }

core/src/main/java/de/bluecolored/bluemap/core/map/hires/block/LiquidModelRenderer.java

@@ -71,7 +71,6 @@ public class LiquidModelRenderer implements BlockRenderer {
 
     private BlockNeighborhood block;
     private BlockState blockState;
-    private boolean isWaterlogged, isWaterLike;
     private Model modelResource;
     private TileModelView blockModel;
     private Color blockColor;
@@ -100,14 +99,16 @@ public LiquidModelRenderer(ResourcePack resourcePack, TextureGallery textureGall
     public void render(BlockNeighborhood block, Variant variant, TileModelView blockModel, Color color) {
         this.block = block;
         this.blockState = block.getBlockState();
-        this.isWaterlogged = blockState.isWaterlogged() || block.getProperties().isAlwaysWaterlogged();
-        this.isWaterLike = blockState.isWater() || isWaterlogged;
         this.modelResource = variant.getModel().getResource(modelProvider);
         this.blockModel = blockModel;
         this.blockColor = color;
 
         if (this.modelResource == null) return;
 
+        // for waterlogged blocks, pretend it's just water
+        if (blockState.isWaterlogged() || block.getProperties().isAlwaysWaterlogged())
+            this.blockState = BlockState.WATER;
+
         build();
     }
 
@@ -145,8 +146,7 @@ private void build() {
         int stillTextureId = textureGallery.get(stillTexturePath);
         int flowTextureId = textureGallery.get(flowTexturePath);
 
-        tintcolor.set(1f, 1f, 1f, 1f, true);
-        if (isWaterLike) blockColorCalculator.getBlendedWaterColor(block, tintcolor);
+        blockColorCalculator.getBlockColor(block, blockState, tintcolor);
 
         int modelStart = blockModel.getStart();
 
@@ -231,13 +231,10 @@ private boolean isLiquidBlockingBlock(BlockState blockState){
     private boolean isSameLiquid(ExtendedBlock block){
         BlockState blockState = block.getBlockState();
 
-        if (this.isWaterlogged)
+        if (this.blockState.isWater())
             return blockState.isWater() || blockState.isWaterlogged() || block.getProperties().isAlwaysWaterlogged();
 
-        if (blockState.getId().equals(this.blockState.getId()))
-            return true;
-
-        return this.isWaterLike && (blockState.isWaterlogged() || block.getProperties().isAlwaysWaterlogged());
+        return blockState.getId().equals(this.blockState.getId());
     }
 
     private float getLiquidBaseHeight(BlockState block){

core/src/main/java/de/bluecolored/bluemap/core/resources/BlockColorCalculatorFactory.java

@@ -27,6 +27,7 @@
 import com.flowpowered.math.GenericMath;
 import com.google.gson.stream.JsonReader;
 import de.bluecolored.bluemap.core.util.math.Color;
+import de.bluecolored.bluemap.core.world.BlockState;
 import de.bluecolored.bluemap.core.world.biome.Biome;
 import de.bluecolored.bluemap.core.world.block.BlockAccess;
 import de.bluecolored.bluemap.core.world.block.BlockNeighborhood;
@@ -134,7 +135,12 @@ public class BlockColorCalculator {
 
         @SuppressWarnings("UnusedReturnValue")
         public Color getBlockColor(BlockNeighborhood block, Color target) {
-            String blockId = block.getBlockState().getId().getFormatted();
+            return getBlockColor(block, block.getBlockState(), target);
+        }
+
+        @SuppressWarnings("UnusedReturnValue")
+        public Color getBlockColor(BlockNeighborhood block, BlockState blockState, Color target) {
+            String blockId = blockState.getId().getFormatted();
 
             ColorFunction colorFunction = blockColorMap.get(blockId);
             if (colorFunction == null) colorFunction = blockColorMap.get("default");

core/src/main/java/de/bluecolored/bluemap/core/world/BlockState.java

@@ -52,6 +52,7 @@ public class BlockState {
 
     public static final BlockState AIR = new BlockState(AIR_ID);
     public static final BlockState MISSING = new BlockState(MISSING_ID);
+    public static final BlockState WATER = new BlockState(WATER_ID);
 
     private boolean hashed;
     private int hash;

core/src/main/resourceExtensions/assets/minecraft/blockColors.json

@@ -1,24 +1,29 @@
 {
-    "default": "@foliage",
+    "default": "#ffffff",
     "minecraft:water": "@water",
-    "minecraft:cauldron": "@water",
     "minecraft:water_cauldron": "@water",
-    "minecraft:powder_snow_cauldron": "#ffffff",
-    "minecraft:lava_cauldron": "#ffffff",
+    "minecraft:redstone_wire": "@redstone",
+    "minecraft:oak_leaves": "@foliage",
+    "minecraft:jungle_leaves": "@foliage",
+    "minecraft:acacia_leaves": "@foliage",
+    "minecraft:dark_oak_leaves": "@foliage",
+    "minecraft:mangrove_leaves": "@foliage",
+    "minecraft:birch_leaves": 8431445,
+    "minecraft:spruce_leaves": 6396257,
+    "minecraft:vine": "@foliage",
     "minecraft:grass_block": "@grass",
     "minecraft:grass": "@grass",
     "minecraft:short_grass": "@grass",
     "minecraft:tall_grass": "@grass",
     "minecraft:fern": "@grass",
     "minecraft:large_fern": "@grass",
+    "minecraft:potted_fern": "@grass",
     "minecraft:bamboo": "@grass",
     "minecraft:sugar_cane": "@grass",
-    "minecraft:redstone_wire": "@redstone",
-    "minecraft:birch_leaves": 8431445,
-    "minecraft:spruce_leaves": 6396257,
-    "minecraft:stonecutter": "#ffffff",
-    "minecraft:snow": "#ffffff",
-    "minecraft:cherry_leaves": "#ffffff",
+    "minecraft:pink_petals": "@grass",
+    "minecraft:bush": "@grass",
+    "minecraft:wildflowers": "@grass",
+    "minecraft:leaf_litter": "@dry_foliage",
     "minecraft:white_banner": "#f9fffe",
     "minecraft:light_gray_banner": "#9d9d97",
     "minecraft:gray_banner": "#474f52",
@@ -66,8 +71,5 @@
     "minecraft:blue_shulker_box": "#3c44aa",
     "minecraft:purple_shulker_box": "#8932b8",
     "minecraft:magenta_shulker_box": "#c74ebd",
-    "minecraft:pink_shulker_box": "#f38baa",
-    "minecraft:pale_oak_leaves": "#ffffff",
-    "minecraft:leaf_litter": "@dry_foliage",
-    "minecraft:bush": "@grass"
+    "minecraft:pink_shulker_box": "#f38baa"
 }