wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor WorldGeneratorInjector refactoring

Browse Source
This commit is contained in:
James Seibel
2022-11-25 10:08:47 -06:00
parent 0a806c1218
commit 00c7f7adaf
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class WorldGeneratorTestCore implements IDhApiWorldGenerator
/** Returns which thread chunk generation requests can be created on. */
@Override
public EDhApiWorldGenThreadMode getCoreThreadingMode()
public EDhApiWorldGenThreadMode getThreadingMode()
{
return THREAD_MODE;
}
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class WorldGeneratorTestPrimary implements IDhApiWorldGenerator
//======================//
@Override
public EDhApiWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
public EDhApiWorldGenThreadMode getThreadingMode() { return THREAD_MODE; }
@Override
public IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate)
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class WorldGeneratorTestSecondary implements IDhApiWorldGenerator
//======================//
@Override
public EDhApiWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
public EDhApiWorldGenThreadMode getThreadingMode() { return THREAD_MODE; }
@Override
public IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate)
core/src/test/java/tests/DependencyInjectorTest.java
+7 -7
View File
@@ -189,7 +189,7 @@ public class DependencyInjectorTest
// standard get
generator = TEST_INJECTOR.get();
Assert.assertEquals("Override returned incorrect override type.", generator.getPriority(), OverrideInjector.CORE_PRIORITY);
Assert.assertEquals("Incorrect generator returned.", generator.getCoreThreadingMode(), WorldGeneratorTestCore.THREAD_MODE);
Assert.assertEquals("Incorrect generator returned.", generator.getThreadingMode(), WorldGeneratorTestCore.THREAD_MODE);
// secondary override
@@ -197,7 +197,7 @@ public class DependencyInjectorTest
// priority gets
generator = TEST_INJECTOR.get();
Assert.assertEquals("Override returned incorrect override type.", generator.getPriority(), WorldGeneratorTestSecondary.PRIORITY);
Assert.assertEquals("Incorrect override object returned.", generator.getCoreThreadingMode(), WorldGeneratorTestSecondary.THREAD_MODE);
Assert.assertEquals("Incorrect override object returned.", generator.getThreadingMode(), WorldGeneratorTestSecondary.THREAD_MODE);
// primary override
@@ -205,13 +205,13 @@ public class DependencyInjectorTest
// priority gets
generator = TEST_INJECTOR.get();
Assert.assertEquals("Override returned incorrect override type.", generator.getPriority(), WorldGeneratorTestPrimary.PRIORITY);
Assert.assertEquals("Incorrect override object returned.", generator.getCoreThreadingMode(), WorldGeneratorTestPrimary.THREAD_MODE);
Assert.assertEquals("Incorrect override object returned.", generator.getThreadingMode(), WorldGeneratorTestPrimary.THREAD_MODE);
// in-line get
// (make sure the returned type is correct and compiles, the actual value doesn't matter)
EDhApiWorldGenThreadMode threadMode = TEST_INJECTOR.get().getCoreThreadingMode();
EDhApiWorldGenThreadMode threadMode = TEST_INJECTOR.get().getThreadingMode();
}
@@ -243,7 +243,7 @@ public class DependencyInjectorTest
generator = TEST_INJECTOR.get();
Assert.assertNotNull("Backup generator not bound.", generator);
Assert.assertEquals("Incorrect backup generator bound.", generator.getPriority(), OverrideInjector.CORE_PRIORITY);
Assert.assertEquals("Incorrect backup generator bound.", generator.getCoreThreadingMode(), WorldGeneratorTestCore.THREAD_MODE);
Assert.assertEquals("Incorrect backup generator bound.", generator.getThreadingMode(), WorldGeneratorTestCore.THREAD_MODE);
// bind level specific
@@ -254,13 +254,13 @@ 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.getCoreThreadingMode(), WorldGeneratorTestPrimary.THREAD_MODE);
Assert.assertEquals("Incorrect level generator bound.", generator.getThreadingMode(), WorldGeneratorTestPrimary.THREAD_MODE);
// get unbound level generator
generator = TEST_INJECTOR.get(unboundLevel);
Assert.assertNotNull("Backup level generator not bound.", generator);
Assert.assertEquals("Incorrect level generator bound.", generator.getPriority(), OverrideInjector.CORE_PRIORITY);
Assert.assertEquals("Incorrect level generator bound.", generator.getCoreThreadingMode(), WorldGeneratorTestCore.THREAD_MODE);
Assert.assertEquals("Incorrect level generator bound.", generator.getThreadingMode(), WorldGeneratorTestCore.THREAD_MODE);
}