From 858c5a27adad839a1aab635bb90a701da68aa614 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sun, 22 Aug 2021 03:49:51 -0400 Subject: [PATCH] Sync post --- .../java/com/volmit/iris/engine/IrisEngine.java | 8 +++++--- .../iris/engine/modifier/IrisPostModifier.java | 14 +++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index d6278b91b..69584183b 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -417,11 +417,13 @@ public class IrisEngine extends BlockPopulator implements Engine { burst().burst(multicore, () -> getCaveModifier().modify(x, z, vblocks, multicore), () -> getDecorantActuator().actuate(x, z, blocks, multicore), - () -> getRavineModifier().modify(x, z, vblocks, multicore), - () -> getPostModifier().modify(x, z, vblocks, multicore) + () -> getRavineModifier().modify(x, z, vblocks, multicore) ); + + getDecorantActuator().actuate(x, z, blocks, multicore); + getPostModifier().modify(x, z, vblocks, multicore); + burst().burst(multicore, - () -> getDecorantActuator().actuate(x, z, blocks, multicore), () -> getMantle().insertMatter(x >> 4, z >> 4, BlockData.class, blocks, multicore), () -> getDepositModifier().modify(x, z, blocks, multicore) ); diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index 96630255a..5b772153a 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -64,19 +64,15 @@ public class IrisPostModifier extends EngineAssignedModifier { PrecisionStopwatch p = PrecisionStopwatch.start(); AtomicInteger i = new AtomicInteger(); AtomicInteger j = new AtomicInteger(); - BurstExecutor burst = burst().burst(multicore); Hunk sync = output.synchronize(); for (i.set(0); i.get() < output.getWidth(); i.getAndIncrement()) { - burst.queue(() -> { - for (j.set(0); j.get() < output.getDepth(); j.getAndIncrement()) { - int ii = i.get(); - int jj = j.get(); - post(ii, jj, sync, ii + x, jj + z); - } - }); + for (j.set(0); j.get() < output.getDepth(); j.getAndIncrement()) { + int ii = i.get(); + int jj = j.get(); + post(ii, jj, sync, ii + x, jj + z); + } } - burst.complete(); getEngine().getMetrics().getPost().put(p.getMilliseconds()); }