Clarify the world gen progress message

This commit is contained in:
James Seibel
2026-05-30 19:44:29 -05:00
parent e8f27f7da8
commit 9231a48998
4 changed files with 12 additions and 1 deletions
@@ -102,7 +102,7 @@ public abstract class AbstractLodRequestState
remainingChunkCount += this.retrievalQueue.getQueuedChunkCount(); remainingChunkCount += this.retrievalQueue.getQueuedChunkCount();
String remainingChunkCountStr = F3Screen.NUMBER_FORMAT.format(remainingChunkCount); 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) if (this.dhLevel.getClass() == DhServerLevel.class)
{ {
// server levels can have multiple world generators running at once, // server levels can have multiple world generators running at once,
@@ -65,6 +65,12 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
*/ */
byte highestDataDetail(); 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 //endregion
@@ -51,6 +51,9 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue
@Override @Override
public byte highestDataDetail() { return LodUtil.BLOCK_DETAIL_LEVEL; } public byte highestDataDetail() { return LodUtil.BLOCK_DETAIL_LEVEL; }
@Override
public String getRetrievalTypeName() { return "downloading"; }
@Override @Override
public CompletableFuture<DataSourceRetrievalResult> submitRetrievalTask(long sectionPos, byte requiredDataDetail) public CompletableFuture<DataSourceRetrievalResult> submitRetrievalTask(long sectionPos, byte requiredDataDetail)
{ {
@@ -593,6 +593,8 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
@Override public byte lowestDataDetail() { return this.lowestDataDetail; } @Override public byte lowestDataDetail() { return this.lowestDataDetail; }
@Override public byte highestDataDetail() { return this.highestDataDetail; } @Override public byte highestDataDetail() { return this.highestDataDetail; }
@Override public String getRetrievalTypeName() { return "generating"; }
@Override public int getEstimatedRemainingTaskCount() { return this.estimatedRemainingTaskCount; } @Override public int getEstimatedRemainingTaskCount() { return this.estimatedRemainingTaskCount; }
@Override public void setEstimatedRemainingTaskCount(int newEstimate) { this.estimatedRemainingTaskCount = newEstimate; } @Override public void setEstimatedRemainingTaskCount(int newEstimate) { this.estimatedRemainingTaskCount = newEstimate; }