From b2bbd315489883322365f027f088ec692a088e7f Mon Sep 17 00:00:00 2001
From: cyberpwn <danielmillst@gmail.com>
Date: Wed, 7 Sep 2022 17:07:34 -0400
Subject: [PATCH] Disable multicore chunks

---
 build.gradle                                                   | 2 +-
 .../com/volmit/iris/engine/platform/BukkitChunkGenerator.java  | 2 +-
 .../java/com/volmit/iris/util/stream/ProceduralStream.java     | 2 +-
 .../com/volmit/iris/util/stream/utility/CachedStream2D.java    | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a3a6d42b9..7beb105d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,7 +121,7 @@ dependencies {
     // Provided or Classpath
     compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
-    implementation 'org.spigotmc:spigot-api:1.19.1-R0.1-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
     implementation 'me.clip:placeholderapi:2.11.1'
     implementation 'io.th0rgal:oraxen:1.94.0'
     implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang'
diff --git a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
index 9d644fcf0..6890c75f9 100644
--- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
+++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
@@ -142,7 +142,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
             Hunk<BlockData> blocks = Hunk.view(tc);
             Hunk<Biome> biomes = Hunk.view(tc, tc.getMinHeight(), tc.getMaxHeight());
             this.world.bind(world);
-            getEngine().generate(x << 4, z << 4, blocks, biomes, true);
+            getEngine().generate(x << 4, z << 4, blocks, biomes, false);
             Iris.debug("Regenerated " + x + " " + z);
             int t = 0;
             for(int i = getEngine().getHeight() >> 4; i >= 0; i--) {
diff --git a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java
index c4ac879b4..7071f1fd4 100644
--- a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java
+++ b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java
@@ -290,7 +290,7 @@ public interface ProceduralStream<T> extends ProceduralLayer, Interpolated<T> {
         return new To3DStream<T>(this);
     }
 
-    default ProceduralStream<T> cache2D(String name, Engine engine, int size) {
+    default CachedStream2D<T> cache2D(String name, Engine engine, int size) {
         return new CachedStream2D<T>(name, engine, this, size);
     }
 
diff --git a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java
index 5bfda4b23..f801a22e5 100644
--- a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java
+++ b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java
@@ -24,6 +24,8 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.MeteredCache;
 import com.volmit.iris.util.data.KCache;
+import com.volmit.iris.util.hunk.Hunk;
+import com.volmit.iris.util.hunk.storage.ArrayHunk;
 import com.volmit.iris.util.stream.BasicStream;
 import com.volmit.iris.util.stream.ProceduralStream;
 
@@ -31,6 +33,7 @@ public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStrea
     private final ProceduralStream<T> stream;
     private final KCache<Long, T> cache;
     private final Engine engine;
+    private boolean chunked = true;
 
     public CachedStream2D(String name, Engine engine, ProceduralStream<T> stream, int size) {
         super();