From 7e0e51103b400235853f2b73f3618c72f7a8b102 Mon Sep 17 00:00:00 2001 From: Builderb0y Date: Fri, 18 Aug 2023 01:57:08 +0000 Subject: [PATCH] Fix querying block colors at constant position. --- .../common/wrappers/block/cache/ClientBlockDetailMap.java | 2 +- .../common/wrappers/block/cache/ClientBlockStateCache.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java index 5e95387e6..209073efb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java @@ -23,7 +23,7 @@ public class ClientBlockDetailMap public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos) { - return getBlockStateData(state, pos).getAndResolveFaceColor(biome); + return getBlockStateData(state, pos).getAndResolveFaceColor(biome, pos); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java index ea5512f28..235b196a8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java @@ -211,12 +211,12 @@ public class ClientBlockStateCache isColorResolved = true; } - public int getAndResolveFaceColor(BiomeWrapper biome) + public int getAndResolveFaceColor(BiomeWrapper biome, DhBlockPos pos) { // FIXME: impl per-face colors if (!needPostTinting) return baseColor; int tintColor = Minecraft.getInstance().getBlockColors() - .getColor(state, new TintWithoutLevelOverrider(biome), pos, tintIndex); + .getColor(state, new TintWithoutLevelOverrider(biome), McObjectConverter.Convert(pos), tintIndex); if (tintColor == -1) return baseColor; return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor); }