From b80d1c784d1f9315200d1c7fabe3c17adabb6aba Mon Sep 17 00:00:00 2001 From: cola98765 Date: Sun, 26 Dec 2021 15:45:13 +0100 Subject: [PATCH] fix SPRUCE and BIRCH leaves --- .../lod/forge/wrappers/block/BlockColorWrapper.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/seibel/lod/forge/wrappers/block/BlockColorWrapper.java b/src/main/java/com/seibel/lod/forge/wrappers/block/BlockColorWrapper.java index 20af9b0af..0c7213922 100644 --- a/src/main/java/com/seibel/lod/forge/wrappers/block/BlockColorWrapper.java +++ b/src/main/java/com/seibel/lod/forge/wrappers/block/BlockColorWrapper.java @@ -238,7 +238,13 @@ public class BlockColorWrapper implements IBlockColorWrapper 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 */ @@ -255,7 +261,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; }