From a3c991d769f610ccd4d83be598cb8be0e6f72c4c Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 21 Jun 2023 07:03:28 -0500 Subject: [PATCH] Remove unimplemented IDhApiWorldGen.getThreadingMode() --- .../override/worldGenerator/IDhApiWorldGenerator.java | 6 +++--- .../distanthorizons/core/generation/BatchGenerator.java | 5 +++-- .../objects/TestWorldGenerator.java | 7 ++----- .../objects/WorldGeneratorTestCore.java | 8 ++++---- .../objects/WorldGeneratorTestPrimary.java | 4 ++-- .../objects/WorldGeneratorTestSecondary.java | 4 ++-- core/src/test/java/tests/DependencyInjectorTest.java | 6 +++--- 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java index 4e75f1889..0563a08f3 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java @@ -22,9 +22,9 @@ public interface IDhApiWorldGenerator extends Closeable, IDhApiOverrideable /** * Returns which thread chunk generation requests will be run on.
- * TODO: only {@link EDhApiWorldGenThreadMode#SINGLE_THREADED} is currently supported + * TODO: only {@link EDhApiWorldGenThreadMode#MULTI_THREADED} is implemented */ - EDhApiWorldGenThreadMode getThreadingMode(); + //EDhApiWorldGenThreadMode getThreadingMode(); /** * Defines the smallest datapoint size that can be generated at a time.
@@ -83,7 +83,7 @@ public interface IDhApiWorldGenerator extends Closeable, IDhApiOverrideable /** * This method is called by Distant Horizons to generate terrain over a given area - * from a thread defined by {@link IDhApiWorldGenerator#getThreadingMode}.

+ * from a thread defined by Distant Horizons.

* * After a chunk has been generated it (and any necessary supporting objects as listed below) should be passed into the * resultConsumer's {@link Consumer#accept} method. If the Consumer is given the wrong data diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java index 3597b65d9..702ad2327 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java @@ -88,8 +88,9 @@ public class BatchGenerator implements IDhApiWorldGenerator // generator parameters // //======================// - @Override - public EDhApiWorldGenThreadMode getThreadingMode() { return EDhApiWorldGenThreadMode.MULTI_THREADED; } + // TODO implement +// @Override +// public EDhApiWorldGenThreadMode getThreadingMode() { return EDhApiWorldGenThreadMode.MULTI_THREADED; } @Override public byte getSmallestDataDetailLevel() { return LodUtil.BLOCK_DETAIL_LEVEL; } diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java index bd022a605..c7e8ab0f8 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java @@ -18,7 +18,7 @@ import java.util.function.Consumer; */ public class TestWorldGenerator implements IDhApiWorldGenerator { - public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.SINGLE_THREADED; + public static final byte SMALLEST_DETAIL_LEVEL = 1; // testable methods // @@ -27,7 +27,7 @@ public class TestWorldGenerator implements IDhApiWorldGenerator public int getPriority() { return OverrideInjector.CORE_PRIORITY; } @Override - public EDhApiWorldGenThreadMode getThreadingMode() { return THREAD_MODE; } + public byte getSmallestDataDetailLevel() { return SMALLEST_DETAIL_LEVEL; } @@ -38,9 +38,6 @@ public class TestWorldGenerator implements IDhApiWorldGenerator // generator parameters // //======================// - @Override - public byte getSmallestDataDetailLevel() { return LodUtil.BLOCK_DETAIL_LEVEL; } - @Override public byte getLargestDataDetailLevel() { return LodUtil.BLOCK_DETAIL_LEVEL; } diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java index eb8daf897..418e02a06 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java @@ -10,14 +10,14 @@ import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; */ public class WorldGeneratorTestCore extends TestWorldGenerator { - public static int PRIORITY = OverrideInjector.CORE_PRIORITY; - public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.SINGLE_THREADED; + public static final int PRIORITY = OverrideInjector.CORE_PRIORITY; + public static final byte SMALLEST_DETAIL_LEVEL = 1; @Override public int getPriority() { return PRIORITY; } - @Override - public EDhApiWorldGenThreadMode getThreadingMode() { return THREAD_MODE; } + @Override + public byte getSmallestDataDetailLevel() { return SMALLEST_DETAIL_LEVEL; } } diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java index 4f62ff860..6c1502887 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java @@ -12,7 +12,7 @@ import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; public class WorldGeneratorTestPrimary extends TestWorldGenerator { public static int PRIORITY = OverrideInjector.DEFAULT_NON_CORE_OVERRIDE_PRIORITY + 5; - public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.MULTI_THREADED; + public static final byte SMALLEST_DETAIL_LEVEL = 2; @@ -20,6 +20,6 @@ public class WorldGeneratorTestPrimary extends TestWorldGenerator public int getPriority() { return PRIORITY; } @Override - public EDhApiWorldGenThreadMode getThreadingMode() { return THREAD_MODE; } + public byte getSmallestDataDetailLevel() { return SMALLEST_DETAIL_LEVEL; } } diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java index 45af0d7cc..e45e13ff3 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java @@ -12,13 +12,13 @@ import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; public class WorldGeneratorTestSecondary extends TestWorldGenerator { public static int PRIORITY = OverrideInjector.DEFAULT_NON_CORE_OVERRIDE_PRIORITY; - public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.SERVER_THREAD; + public static final byte SMALLEST_DETAIL_LEVEL = 3; @Override public int getPriority() { return PRIORITY; } @Override - public EDhApiWorldGenThreadMode getThreadingMode() { return THREAD_MODE; } + public byte getSmallestDataDetailLevel() { return SMALLEST_DETAIL_LEVEL; } } diff --git a/core/src/test/java/tests/DependencyInjectorTest.java b/core/src/test/java/tests/DependencyInjectorTest.java index fb0ce196e..e84201de7 100644 --- a/core/src/test/java/tests/DependencyInjectorTest.java +++ b/core/src/test/java/tests/DependencyInjectorTest.java @@ -180,7 +180,7 @@ public class DependencyInjectorTest generator = TEST_INJECTOR.get(boundLevel); Assert.assertNotNull("Level generator not bound.", generator); Assert.assertEquals("Incorrect level generator bound.", generator.getPriority(), WorldGeneratorTestCore.PRIORITY); - Assert.assertEquals("Incorrect level generator bound.", generator.getThreadingMode(), WorldGeneratorTestCore.THREAD_MODE); + Assert.assertEquals("Incorrect level generator bound.", generator.getSmallestDataDetailLevel(), WorldGeneratorTestCore.SMALLEST_DETAIL_LEVEL); // unbound level should still return null Assert.assertNull("Nothing should have been bound to this level.", TEST_INJECTOR.get(unboundLevel)); @@ -194,7 +194,7 @@ public class DependencyInjectorTest generator = TEST_INJECTOR.get(boundLevel); Assert.assertNotNull("Level generator not bound.", generator); Assert.assertEquals("Incorrect level generator bound.", generator.getPriority(), WorldGeneratorTestSecondary.PRIORITY); - Assert.assertEquals("Incorrect level generator bound.", generator.getThreadingMode(), WorldGeneratorTestSecondary.THREAD_MODE); + Assert.assertEquals("Incorrect level generator bound.", generator.getSmallestDataDetailLevel(), WorldGeneratorTestSecondary.SMALLEST_DETAIL_LEVEL); // the unbound level should still return null Assert.assertNull("Nothing should have been bound to this level.", TEST_INJECTOR.get(unboundLevel)); @@ -208,7 +208,7 @@ public class DependencyInjectorTest generator = TEST_INJECTOR.get(boundLevel); Assert.assertNotNull("Level generator not bound.", generator); Assert.assertEquals("Incorrect level generator bound.", generator.getPriority(), WorldGeneratorTestPrimary.PRIORITY); - Assert.assertEquals("Incorrect level generator bound.", generator.getThreadingMode(), WorldGeneratorTestPrimary.THREAD_MODE); + Assert.assertEquals("Incorrect level generator bound.", generator.getSmallestDataDetailLevel(), WorldGeneratorTestPrimary.SMALLEST_DETAIL_LEVEL); // the unbound level should still return null Assert.assertNull("Nothing should have been bound to this level.", TEST_INJECTOR.get(unboundLevel));