diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java index 8ce042b0e..a82cd04f7 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java @@ -27,15 +27,9 @@ import java.util.stream.Stream; public class TintGetterOverrideFast implements BlockAndTintGetter { LevelReader parent; - private final Object2ObjectArrayMap> tintCaches; public TintGetterOverrideFast(LevelReader parent) { this.parent = parent; - this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> { - object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new ConcurrentHashMap()); - object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new ConcurrentHashMap()); - object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new ConcurrentHashMap()); - }); } private Biome _getBiome(BlockPos pos) { @@ -49,11 +43,7 @@ public class TintGetterOverrideFast implements BlockAndTintGetter { @Override public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { Biome b = _getBiome(blockPos); - ConcurrentHashMap concurrentHashMap = this.tintCaches.get(colorResolver); - if (concurrentHashMap == null) { // This is a compat fix for Colormatic's mixin - this.tintCaches.put(colorResolver, concurrentHashMap = new ConcurrentHashMap<>()); - } - return concurrentHashMap.computeIfAbsent(b, (key) -> colorResolver.getColor(b, blockPos.getX(), blockPos.getZ())); + return colorResolver.getColor(b, blockPos.getX(), blockPos.getZ()); } @Override diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java index 54dc28e33..7077325e3 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java @@ -26,17 +26,11 @@ import java.util.stream.Stream; public class TintGetterOverrideSmooth implements BlockAndTintGetter { LevelReader parent; - private final Object2ObjectArrayMap tintCaches; public int smoothingRange; public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) { this.parent = parent; this.smoothingRange = smoothingRange; - this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> { - object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.GRASS_COLOR_RESOLVER))); - object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.FOLIAGE_COLOR_RESOLVER))); - object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.WATER_COLOR_RESOLVER))); - }); } private Biome _getBiome(BlockPos pos) { @@ -71,12 +65,7 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter { @Override public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { - BlockTintCache blockTintCache = this.tintCaches.get(colorResolver); - if (blockTintCache == null) { // This is a compat fix for Colormatic's mixin - this.tintCaches.put(colorResolver, - blockTintCache = new BlockTintCache((pos) -> calculateBlockTint(pos, colorResolver))); - } - return blockTintCache.getColor(blockPos); + return calculateBlockTint(blockPos, colorResolver); } @Override