From c744f761a1f77f55b5184d53abc16a79bbdd9f60 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Mon, 20 Sep 2021 07:14:38 -0400 Subject: [PATCH] Wire modes to engine --- src/main/java/com/volmit/iris/engine/IrisEngine.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index a8ff713e7..278320078 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -93,7 +93,6 @@ public class IrisEngine implements Engine { private final ChronoLatch perSecondBudLatch; private final EngineMetrics metrics; private final boolean studio; - private final KList stages; private final AtomicRollingSequence wallClock; private final int art; private EngineMode mode; @@ -117,7 +116,6 @@ public class IrisEngine implements Engine { public IrisEngine(EngineTarget target, boolean studio) { this.studio = studio; this.target = target; - stages = new KList<>(); getEngineData(); verifySeed(); this.seedManager = new SeedManager(target.getWorld().getRawWorldSeed()); @@ -167,8 +165,6 @@ public class IrisEngine implements Engine { worldManager.close(); complex.close(); execution.close(); - stages.forEach(EngineStage::close); - stages.clear(); effects.close(); mode.close(); @@ -395,10 +391,9 @@ public class IrisEngine implements Engine { getWorldManager().close(); getTarget().close(); saveEngineData(); - stages.forEach(EngineStage::close); - stages.clear(); getMantle().close(); getComplex().close(); + mode.close(); getData().dump(); getData().clearLists(); Iris.service(PreservationSVC.class).dereference(); @@ -457,9 +452,7 @@ public class IrisEngine implements Engine { } } } else { - for (EngineStage i : stages) { - i.generate(x, z, blocks, vbiomes, multicore); - } + mode.generate(x, z, blocks, vbiomes, multicore); } getMetrics().getTotal().put(p.getMilliseconds());