From 323cd95bff66c0c2b993e4c4cf6a0afee5fe2cd1 Mon Sep 17 00:00:00 2001
From: mcrcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Wed, 7 Aug 2024 01:54:21 +1000
Subject: [PATCH] Swap to chunk count estimation

---
 .../me/cortex/voxy/client/importers/WorldImporter.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
index b6a76a2f..67c63d3e 100644
--- a/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
+++ b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
@@ -48,6 +48,7 @@ public class WorldImporter {
     private final WorldEngine world;
     private final ReadableContainer<RegistryEntry<Biome>> defaultBiomeProvider;
     private final Codec<ReadableContainer<RegistryEntry<Biome>>> biomeCodec;
+    private final AtomicInteger estimatedTotalChunks = new AtomicInteger();//Slowly converges to the true value
     private final AtomicInteger totalChunks = new AtomicInteger();
     private final AtomicInteger chunksProcessed = new AtomicInteger();
 
@@ -119,11 +120,13 @@ public class WorldImporter {
     private UpdateCallback updateCallback;
     public void importWorldAsyncStart(File directory, UpdateCallback updateCallback, Runnable onCompletion) {
         this.totalChunks.set(0);
+        this.estimatedTotalChunks.set(0);
         this.chunksProcessed.set(0);
         this.updateCallback = updateCallback;
         this.worker = new Thread(() -> {
             this.isRunning = true;
             var files = directory.listFiles();
+            this.estimatedTotalChunks.addAndGet(files.length*1024);
             for (var file : files) {
                 if (!file.isFile()) {
                     continue;
@@ -136,6 +139,7 @@ public class WorldImporter {
                 }
                 int rx = Integer.parseInt(sections[1]);
                 int rz = Integer.parseInt(sections[2]);
+                this.estimatedTotalChunks.addAndGet(-1024);
                 try {
                     this.importRegionFile(file.toPath(), rx, rz);
                 } catch (IOException e) {
@@ -226,6 +230,7 @@ public class WorldImporter {
                                 }
                             });
                             this.totalChunks.incrementAndGet();
+                            this.estimatedTotalChunks.incrementAndGet();
                             this.threadPool.execute();
                         }
                     }
@@ -263,7 +268,7 @@ public class WorldImporter {
             e.printStackTrace();
         }
 
-        this.updateCallback.update(this.chunksProcessed.incrementAndGet(), this.totalChunks.get());
+        this.updateCallback.update(this.chunksProcessed.incrementAndGet(), this.estimatedTotalChunks.get());
     }
 
     private static int getIndex(int x, int y, int z) {