From 9231a489986d8fa96d005ad288f6cdbe0237208d Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 30 May 2026 19:44:29 -0500 Subject: [PATCH] Clarify the world gen progress message --- .../core/generation/queues/AbstractLodRequestState.java | 2 +- .../generation/queues/IFullDataSourceRetrievalQueue.java | 6 ++++++ .../core/generation/queues/RemoteWorldRetrievalQueue.java | 3 +++ .../core/generation/queues/WorldGenerationQueue.java | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/AbstractLodRequestState.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/AbstractLodRequestState.java index afc2fe599..0a9144bf1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/AbstractLodRequestState.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/AbstractLodRequestState.java @@ -102,7 +102,7 @@ public abstract class AbstractLodRequestState remainingChunkCount += this.retrievalQueue.getQueuedChunkCount(); String remainingChunkCountStr = F3Screen.NUMBER_FORMAT.format(remainingChunkCount); - String message = "DH is generating chunks. "; + String message = "DH is "+this.retrievalQueue.getRetrievalTypeName()+" chunks. "; if (this.dhLevel.getClass() == DhServerLevel.class) { // server levels can have multiple world generators running at once, diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/IFullDataSourceRetrievalQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/IFullDataSourceRetrievalQueue.java index de064168a..d93860b76 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/IFullDataSourceRetrievalQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/IFullDataSourceRetrievalQueue.java @@ -65,6 +65,12 @@ public interface IFullDataSourceRetrievalQueue extends Closeable */ byte highestDataDetail(); + /** + * Returns a value like "downloading" or "generating" depending on how the LODs are being retrieved. + * Used to make the progress message easier to understand. + */ + String getRetrievalTypeName(); + //endregion diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/RemoteWorldRetrievalQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/RemoteWorldRetrievalQueue.java index 7042f9a3a..1ad5c00e6 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/RemoteWorldRetrievalQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/RemoteWorldRetrievalQueue.java @@ -51,6 +51,9 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue @Override public byte highestDataDetail() { return LodUtil.BLOCK_DETAIL_LEVEL; } + @Override + public String getRetrievalTypeName() { return "downloading"; } + @Override public CompletableFuture submitRetrievalTask(long sectionPos, byte requiredDataDetail) { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/WorldGenerationQueue.java index 4952e203e..3112761d1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/WorldGenerationQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/queues/WorldGenerationQueue.java @@ -593,6 +593,8 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb @Override public byte lowestDataDetail() { return this.lowestDataDetail; } @Override public byte highestDataDetail() { return this.highestDataDetail; } + @Override public String getRetrievalTypeName() { return "generating"; } + @Override public int getEstimatedRemainingTaskCount() { return this.estimatedRemainingTaskCount; } @Override public void setEstimatedRemainingTaskCount(int newEstimate) { this.estimatedRemainingTaskCount = newEstimate; }