diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/bop/BopFogColorSource.java b/src/main/java/com/gtnewhorizons/angelica/compat/bop/BopFogColorSource.java index fdedce937..6ec0e744f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/bop/BopFogColorSource.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/bop/BopFogColorSource.java @@ -17,6 +17,10 @@ public final class BopFogColorSource implements BopFogBlend.ColorSource { return this; } + public void freeWorld() { + this.world = null; + } + @Override public int fogColour(int x, int y, int z) { final BiomeGenBase biome = FogBiomeCache.get(world, x, z); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/bop/FogBiomeCache.java b/src/main/java/com/gtnewhorizons/angelica/compat/bop/FogBiomeCache.java index 7afa61f50..80b28f49e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/bop/FogBiomeCache.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/bop/FogBiomeCache.java @@ -9,7 +9,7 @@ public final class FogBiomeCache { private static final int MAX_ENTRIES = 16384; private static final Long2ObjectOpenHashMap CACHE = new Long2ObjectOpenHashMap<>(); - private static World lastWorld; + private static World cachedWorld; private static int generation; private FogBiomeCache() {} @@ -18,10 +18,14 @@ public final class FogBiomeCache { return generation; } + public static void invalidate() { + cachedWorld = null; + } + public static BiomeGenBase get(World world, int x, int z) { - if (world != lastWorld) { + if (world != cachedWorld) { CACHE.clear(); - lastWorld = world; + cachedWorld = world; generation++; } final long key = ((long) x << 32) | (z & 0xFFFFFFFFL); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java index 9d1020246..c7a28b1e8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java @@ -6,6 +6,8 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import com.gtnewhorizons.angelica.compat.bop.BopFogBlend; +import com.gtnewhorizons.angelica.compat.bop.FogBiomeCache; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -166,6 +168,8 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer