Remove the 2D cache bypass

Hydrology sampling now goes through the engine 2D caches; the thread-local bypass and its test are gone.

core/src/main/java/art/arcane/iris/engine/hydrology/runtime/IrisHydrologyRuntime.java

@@ -95,13 +95,9 @@ public final class IrisHydrologyRuntime implements AutoCloseable {
         this.settings = createSettings(context.dimension(), hydrology);
         HydrologyGeometrySampler geometrySampler = geometrySampler(context, hydrology);
         IrisHydrologyRoutingTerrainSampler.Sources terrainSources = new IrisHydrologyRoutingTerrainSampler.Sources(
-                (int x, int z, double rawNaturalHeight) -> ProceduralStream.bypass2DCaches(
-                        () -> createTerrainBasis(x, z, rawNaturalHeight)
-                ),
+                this::createTerrainBasis,
                 (int x, int z) -> context.naturalHeightProvider().sample(x, z),
-                (int x, int z) -> ProceduralStream.bypass2DCaches(
-                        () -> context.naturalOceanClassifier().isOcean(x, z)
-                )
+                (int x, int z) -> context.naturalOceanClassifier().isOcean(x, z)
         );
         this.routingTerrainSampler = new IrisHydrologyRoutingTerrainSampler(
                 terrainSources,
@@ -370,7 +366,7 @@ public final class IrisHydrologyRuntime implements AutoCloseable {
                 return cached;
             }
         }
-        HydrologyTerrainSample sampled = ProceduralStream.bypass2DCaches(() -> createDetailedTerrainSample(x, z));
+        HydrologyTerrainSample sampled = createDetailedTerrainSample(x, z);
         synchronized (terrainSampleLock) {
             HydrologyTerrainSample existing = terrainSamples.get(packed);
             if (existing != null) {

core/src/main/java/art/arcane/iris/util/project/stream/ProceduralStream.java

@@ -72,18 +72,9 @@ import art.arcane.iris.util.project.stream.utility.SynchronizedStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 @SuppressWarnings("ALL")
 public interface ProceduralStream<T> extends ProceduralLayer, Interpolated<T> {
-    static <V> V bypass2DCaches(Supplier<V> operation) {
-        return ProceduralStreamCacheBypass.supply(operation);
-    }
-
-    static boolean is2DCacheBypassActive() {
-        return ProceduralStreamCacheBypass.isActive();
-    }
-
     static ProceduralStream<Double> ofDouble(Function2<Double, Double, Double> f) {
         try {
             return of(f, Interpolated.DOUBLE);

core/src/main/java/art/arcane/iris/util/project/stream/ProceduralStreamCacheBypass.java

@@ -1,28 +0,0 @@
-package art.arcane.iris.util.project.stream;
-
-import java.util.function.Supplier;
-
-final class ProceduralStreamCacheBypass {
-    private static final ThreadLocal<Integer> DEPTH = new ThreadLocal<>();
-
-    private ProceduralStreamCacheBypass() {
-    }
-
-    static boolean isActive() {
-        return DEPTH.get() != null;
-    }
-
-    static <T> T supply(Supplier<T> operation) {
-        Integer previousDepth = DEPTH.get();
-        DEPTH.set(previousDepth == null ? 1 : previousDepth + 1);
-        try {
-            return operation.get();
-        } finally {
-            if (previousDepth == null) {
-                DEPTH.remove();
-            } else {
-                DEPTH.set(previousDepth);
-            }
-        }
-    }
-}

core/src/main/java/art/arcane/iris/util/project/stream/utility/CachedDoubleStream2D.java

@@ -34,9 +34,6 @@ public class CachedDoubleStream2D extends BasicStream<Double> implements Procedu
 
     @Override
     public Double get(double x, double z) {
-        if (ProceduralStream.is2DCacheBypassActive()) {
-            return stream.getDouble((int) x, (int) z);
-        }
         return cache.get((int) x, (int) z);
     }
 
@@ -47,9 +44,6 @@ public class CachedDoubleStream2D extends BasicStream<Double> implements Procedu
 
     @Override
     public double getDouble(double x, double z) {
-        if (ProceduralStream.is2DCacheBypassActive()) {
-            return stream.getDouble((int) x, (int) z);
-        }
         return cache.get((int) x, (int) z);
     }
 

core/src/main/java/art/arcane/iris/util/project/stream/utility/CachedStream2D.java

@@ -55,9 +55,6 @@ public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStrea
 
     @Override
     public T get(double x, double z) {
-        if (ProceduralStream.is2DCacheBypassActive()) {
-            return stream.get((int) x, (int) z);
-        }
         return cache.get((int) x, (int) z);
     }