From 1bb9090434f2d673f7fd90c53e7b2649de1e02ec Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 18 Jul 2021 18:22:51 -0400 Subject: [PATCH] Update engine compounds for iris worlds --- .../com/volmit/iris/engine/IrisEngineCompound.java | 10 +++------- .../volmit/iris/engine/framework/EngineCompound.java | 5 ++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java index 2ba9b78ca..2f932b1fc 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java @@ -28,6 +28,7 @@ import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisDimensionIndex; import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KList; @@ -50,7 +51,7 @@ import java.util.List; public class IrisEngineCompound implements EngineCompound { @Getter - private World world; + private IrisWorld world; private final AtomicRollingSequence wallClock; @@ -77,7 +78,7 @@ public class IrisEngineCompound implements EngineCompound { @Setter private boolean studio; - public IrisEngineCompound(World world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads) { + public IrisEngineCompound(IrisWorld world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads) { wallClock = new AtomicRollingSequence(32); this.rootDimension = rootDimension; Iris.info("Initializing Engine Composite for " + world.getName()); @@ -274,11 +275,6 @@ public class IrisEngineCompound implements EngineCompound { return defaultEngine; } - @Override - public void updateWorld(World world) { - this.world = world; - } - @Override public void hotload() { for (int i = 0; i < getSize(); i++) { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java index cff9a2dd9..ef0740b62 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java @@ -26,6 +26,7 @@ import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; @@ -43,7 +44,7 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider { void generate(int x, int z, Hunk blocks, Hunk postblocks, Hunk biomes); - World getWorld(); + IrisWorld getWorld(); List getStrongholdPositions(); @@ -149,8 +150,6 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider { return v.v(); } - void updateWorld(World world); - default int getLowestBedrock() { int f = Integer.MAX_VALUE;