From 42d80cbe34684456b7a56e27bf4bfa5107320bf3 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 27 Sep 2023 07:54:05 -0500 Subject: [PATCH] minor world gen method renaming --- .../core/file/fullDatafile/GeneratedFullDataFileHandler.java | 1 + .../distanthorizons/core/generation/tasks/WorldGenTask.java | 5 +---- .../seibel/distanthorizons/core/level/WorldGenModule.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java index 291415cbc..65127c8ab 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java @@ -105,6 +105,7 @@ public class GeneratedFullDataFileHandler extends FullDataFileHandler * Assigns the queue for handling world gen and does first time setup as well.
* Assumes there isn't a pre-existing queue. */ + public void setWorldGenerationQueue(IWorldGenerationQueue newWorldGenQueue) { boolean oldQueueExists = this.worldGenQueueRef.compareAndSet(null, newWorldGenQueue); LodUtil.assertTrue(oldQueueExists, "previous world gen queue is still here!"); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java index fbb12f4bc..c9f52c617 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java @@ -45,9 +45,6 @@ public final class WorldGenTask this.future = future; } - public boolean StillValid() - { - return taskTracker.isMemoryAddressValid(); - } + public boolean StillValid() { return this.taskTracker.isMemoryAddressValid(); } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java b/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java index 2a6e8ac71..5b274857f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java @@ -79,7 +79,7 @@ public class WorldGenModule implements Closeable newWgs.closeAsync(false); } dataFileHandler.addWorldGenCompleteListener(this.onWorldGenCompleteListener); - dataFileHandler.setGenerationQueue(newWgs.worldGenerationQueue); + dataFileHandler.setWorldGenerationQueue(newWgs.worldGenerationQueue); } public void stopWorldGen(GeneratedFullDataFileHandler dataFileHandler)