From 233a179dad9b4d9d4ebe96f8ec5a4365789f0d69 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 30 Jul 2021 04:39:33 -0400 Subject: [PATCH] Pregen progress --- .../iris/core/pregenerator/IrisPregenerator.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java b/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java index a0bbf3fb4..20904845a 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java @@ -18,7 +18,10 @@ package com.volmit.iris.core.pregenerator; +import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.format.C; +import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RollingSequence; @@ -51,9 +54,11 @@ public class IrisPregenerator { private final KSet generatedRegions; private final KSet retry; private final KSet net; + private final ChronoLatch cl; public IrisPregenerator(PregenTask task, PregeneratorMethod generator, PregenListener listener) { this.listener = listenify(listener); + cl = new ChronoLatch(5000); generatedRegions = new KSet<>(); this.shutdown = new AtomicBoolean(false); this.paused = new AtomicBoolean(false); @@ -94,6 +99,11 @@ public class IrisPregenerator { totalChunks.get() - generated.get(), eta, M.ms() - startTime.get(), currentGeneratorMethod.get()); + if(cl.flip()) + { + Iris.info("Pregen: " + Form.f(generated.get()) + " of " + Form.f(totalChunks.get()) + " (" + Form.pc((double) generated.get() / (double) totalChunks.get(), 0) + ") " + Form.f((int) chunksPerSecond.getAverage()) + "/s ETA: " + Form.duration((double)eta, 2)); + } + return 1000; } };