From 2c5f5a3d4cdde3a84d338b7b4f36920178f2434d Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 22 Dec 2025 09:46:21 -0600 Subject: [PATCH] minor refactors --- .../core/dataObjects/fullData/sources/FullDataSourceV2.java | 3 ++- .../distanthorizons/core/generation/WorldGenerationQueue.java | 4 ++-- .../client/AbstractFullDataNetworkRequestQueue.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java index c8b2f34c2..836a65834 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java @@ -202,8 +202,9 @@ public class FullDataSourceV2 public static FullDataSourceV2 createEmpty(long pos) { + FullDataPointIdMap map = new FullDataPointIdMap(pos); return new FullDataSourceV2( - pos, new FullDataPointIdMap(pos), + pos, map, // data points, genSteps, and columnCompression are all null since // nothing has been generated yet. // Using the default value of all 0's is adequate diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java index 2482689fd..345743994 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java @@ -331,7 +331,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb } - // a task has been started or queued + // a task has been started or queued, // queue another task return true; } @@ -360,7 +360,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb this.rollingAverageChunkGenTimeInMs.add(timePerChunk); }); - generationFuture.handle((fullDataSourceV2, exception) -> + generationFuture.handle((FullDataSourceV2 fullDataSource, Throwable exception) -> { try { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java index 8167ba73c..717a9c0f0 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java @@ -155,7 +155,8 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende this.failedRequests.incrementAndGet(); break; default: - if (throwable != null && !(throwable instanceof CancellationException)) + if (throwable != null + && !(throwable instanceof CancellationException)) { this.failedRequests.incrementAndGet(); }