From 97c52834f5cf3022acd97a652d09238f7b468ca8 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Sun, 26 Dec 2021 15:36:18 +0100 Subject: [PATCH] fixed SPRUCE and BIRCH leaves, as they require hardcoded biome color. TODO azalea also is like that --- .../lod/common/wrappers/block/BlockColorWrapper.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java index 2bf344972..cd1c1338f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java @@ -216,8 +216,14 @@ public class BlockColorWrapper implements IBlockColorWrapper this.foliageTint = leavesInstance() && toTint; this.waterTint = waterIstance() && toTint; - - color = tempColor; + + //hardcoded leaves + if (block == Blocks.SPRUCE_LEAVES) + color = ColorUtil.multiplyRGBcolors(tempColor, 0xFF619961); + else if (block == Blocks.BIRCH_LEAVES) + color = ColorUtil.multiplyRGBcolors(tempColor, 0xFF80A755); + else + color = tempColor; } /** determine if the given block should use the biome's grass color */ @@ -234,7 +240,7 @@ public class BlockColorWrapper implements IBlockColorWrapper /** determine if the given block should use the biome's foliage color */ private boolean leavesInstance() { - return block instanceof LeavesBlock + return (block instanceof LeavesBlock && block != Blocks.SPRUCE_LEAVES && block != Blocks.BIRCH_LEAVES) || block == Blocks.VINE || block == Blocks.SUGAR_CANE; }