From 98fe47d0851e1cec41501a3ecf0302bf37d953a8 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Fri, 11 Jun 2021 09:53:10 +0200 Subject: [PATCH] Undo previous calculation change. Move elapsed to start after drawing task for more accuracy. --- src/main/java/com/volmit/iris/pregen/Pregenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/pregen/Pregenerator.java b/src/main/java/com/volmit/iris/pregen/Pregenerator.java index 106580cc5..1b301b5f5 100644 --- a/src/main/java/com/volmit/iris/pregen/Pregenerator.java +++ b/src/main/java/com/volmit/iris/pregen/Pregenerator.java @@ -78,7 +78,6 @@ public class Pregenerator implements Listener public Pregenerator(World world, int blockSize) throws HeadlessException { instance(); - elapsed = M.ms(); latch = new ChronoLatch(5000); memoryMetric = new AtomicReference<>("..."); method = new AtomicReference<>("STARTUP"); @@ -135,6 +134,8 @@ public class Pregenerator implements Listener } }); + elapsed = M.ms(); + new Thread(() -> { flushWorld(); J.sleep(2000); @@ -473,7 +474,7 @@ public class Pregenerator implements Listener } public String[] getProgress() { - long eta = (long) ((totalChunks.get() - generated.get()) / perSecond.getAverage()); + long eta = (long) ((totalChunks.get() - generated.get()) * ((double)(M.ms() - elapsed) / (double) generated.get())); return new String[]{ "Progress: " + Form.f(generated.get()) + " of " + Form.f(totalChunks.get()) + " (" + Form.pc((double)generated.get() / (double)totalChunks.get(), 0) + ")",