From 94535a213ef626dcb57abbfeb59483a86615da06 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 22 Mar 2026 21:40:32 -0500 Subject: [PATCH] LodRequestModule TODO cleanup --- .../core/level/LodRequestModule.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/LodRequestModule.java b/core/src/main/java/com/seibel/distanthorizons/core/level/LodRequestModule.java index e68e9f6cc..2284a7ca0 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/LodRequestModule.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/LodRequestModule.java @@ -168,7 +168,8 @@ public class LodRequestModule implements Closeable } } dataFileHandler.clearRetrievalQueue(); - worldGenState.closeAsync(true).join(); //TODO: Make it async. + // synchronized shutdown necessary to make sure the tasks are all handled correctly + worldGenState.closeAsync(true).join(); dataFileHandler.removeWorldGenCompleteListener(this.onWorldGenCompleteListener); } @@ -198,7 +199,8 @@ public class LodRequestModule implements Closeable if (worldGenState != null) { - worldGenState.closeAsync(true).join(); //TODO: Make it async. + // synchronized shutdown necessary to make sure the tasks are all handled correctly + worldGenState.closeAsync(true).join(); } } } @@ -388,17 +390,17 @@ public class LodRequestModule implements Closeable this.progressUpdateThreadRunning = false; return this.retrievalQueue.startClosingAsync(true, doInterrupt) - .exceptionally(e -> - { - LOGGER.error("Error during first stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e); - return null; - } - ).thenRun(this.retrievalQueue::close) - .exceptionally(e -> - { - LOGGER.error("Error during second stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e); - return null; - }); + .exceptionally(e -> + { + LOGGER.error("Error during first stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e); + return null; + } + ).thenRun(this.retrievalQueue::close) + .exceptionally(e -> + { + LOGGER.error("Error during second stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e); + return null; + }); }