Disable multicore chunks

This commit is contained in:
cyberpwn
2022-09-07 17:07:34 -04:00
parent 28e3402d88
commit b2bbd31548
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -121,7 +121,7 @@ dependencies {
// Provided or Classpath // Provided or Classpath
compileOnly 'org.projectlombok:lombok:1.18.24' compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor '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 'me.clip:placeholderapi:2.11.1'
implementation 'io.th0rgal:oraxen:1.94.0' implementation 'io.th0rgal:oraxen:1.94.0'
implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang' implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang'
@@ -142,7 +142,7 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
Hunk<BlockData> blocks = Hunk.view(tc); Hunk<BlockData> blocks = Hunk.view(tc);
Hunk<Biome> biomes = Hunk.view(tc, tc.getMinHeight(), tc.getMaxHeight()); Hunk<Biome> biomes = Hunk.view(tc, tc.getMinHeight(), tc.getMaxHeight());
this.world.bind(world); 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); Iris.debug("Regenerated " + x + " " + z);
int t = 0; int t = 0;
for(int i = getEngine().getHeight() >> 4; i >= 0; i--) { for(int i = getEngine().getHeight() >> 4; i >= 0; i--) {
@@ -290,7 +290,7 @@ public interface ProceduralStream<T> extends ProceduralLayer, Interpolated<T> {
return new To3DStream<T>(this); 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); return new CachedStream2D<T>(name, engine, this, size);
} }
@@ -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.Engine;
import com.volmit.iris.engine.framework.MeteredCache; import com.volmit.iris.engine.framework.MeteredCache;
import com.volmit.iris.util.data.KCache; 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.BasicStream;
import com.volmit.iris.util.stream.ProceduralStream; 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 ProceduralStream<T> stream;
private final KCache<Long, T> cache; private final KCache<Long, T> cache;
private final Engine engine; private final Engine engine;
private boolean chunked = true;
public CachedStream2D(String name, Engine engine, ProceduralStream<T> stream, int size) { public CachedStream2D(String name, Engine engine, ProceduralStream<T> stream, int size) {
super(); super();