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

Flip API -> Core dependency to Core -> API

Browse Source 
Very rough, a decent amount of the API isn't hooked up to anything.
This commit is contained in:
James Seibel
2022-09-12 21:53:55 -05:00
parent 1bfc6db8b4
commit 4f1203b32c
120 changed files with 736 additions and 3097 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java
+2 -2
View File
@@ -1,6 +1,6 @@
package testItems.overrideInjection.interfaces;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.ICoreDhApiOverrideable;
import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable;
/**
* Dummy override test interface for dependency unit tests.
@@ -8,7 +8,7 @@ import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.
* @author James Seibel
* @version 2022-9-5
*/
public interface IOverrideTest extends ICoreDhApiOverrideable
public interface IOverrideTest extends IDhApiOverrideable
{
public int getValue();
core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java
+13 -2
View File
@@ -1,6 +1,8 @@
package testItems.worldGeneratorInjection.objects;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.world.ICoreDhApiLevelWrapper;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiLevelType;
import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper;
import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper;
/**
* Stub implementation of a Level wrapper for basic unit testing.
@@ -8,11 +10,17 @@ import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.
* @author James Seibel
* @version 2022-9-8
*/
public class LevelWrapperTest implements ICoreDhApiLevelWrapper
public class LevelWrapperTest implements IDhApiLevelWrapper
{
@Override
public Object getWrappedMcObject_UNSAFE() { return null; }
@Override
public IDhApiDimensionTypeWrapper getDimensionType() { return null; }
@Override
public EDhApiLevelType getLevelType() { return null; }
@Override
public boolean hasCeiling() { return false; }
@@ -22,4 +30,7 @@ public class LevelWrapperTest implements ICoreDhApiLevelWrapper
@Override
public int getHeight() { return 0; }
@Override
public int getMinHeight() { return IDhApiLevelWrapper.super.getMinHeight(); }
}
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java
+17 -12
View File
@@ -1,11 +1,11 @@
package testItems.worldGeneratorInjection.objects;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.worldGenerator.ICoreDhApiWorldGenerator;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.world.ICoreDhApiLevelWrapper;
import com.seibel.lod.core.enums.worldGeneration.EWorldGenThreadMode;
import com.seibel.lod.core.enums.worldGeneration.EWorldGenerationStep;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.api.items.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper;
import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.dependencyInjection.OverrideInjector;
import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
/**
* Dummy test implementation object for world generator injection unit tests.
@@ -13,9 +13,9 @@ import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
* @author James Seibel
* @version 2022-7-26
*/
public class WorldGeneratorTestCore implements ICoreDhApiWorldGenerator
public class WorldGeneratorTestCore implements IDhApiWorldGenerator
{
public static EWorldGenThreadMode THREAD_MODE = EWorldGenThreadMode.SINGLE_THREADED;
public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.SINGLE_THREADED;
//==============//
@@ -31,14 +31,19 @@ public class WorldGeneratorTestCore implements ICoreDhApiWorldGenerator
// IDhApiWorldGenerator //
//======================//
@Override
public EWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
@Override
public IChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, ICoreDhApiLevelWrapper serverLevelWrapper, EWorldGenerationStep maxStepToGenerate)
/** Returns which thread chunk generation requests can be created on. */
@Override
public EDhApiWorldGenThreadMode getCoreThreadingMode()
{
return THREAD_MODE;
}
@Override
public IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate)
{
// not necessary for testing
return null;
}
}
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java
+11 -9
View File
@@ -1,7 +1,10 @@
package testItems.worldGeneratorInjection.objects;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.worldGenerator.ICoreDhApiWorldGenerator;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.world.ICoreDhApiLevelWrapper;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.api.items.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper;
import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.enums.worldGeneration.EWorldGenThreadMode;
import com.seibel.lod.core.enums.worldGeneration.EWorldGenerationStep;
import com.seibel.lod.core.dependencyInjection.OverrideInjector;
@@ -13,10 +16,10 @@ import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
* @author James Seibel
* @version 2022-8-9
*/
public class WorldGeneratorTestPrimary implements ICoreDhApiWorldGenerator
public class WorldGeneratorTestPrimary implements IDhApiWorldGenerator
{
public static int PRIORITY = OverrideInjector.DEFAULT_NON_CORE_OVERRIDE_PRIORITY + 5;
public static EWorldGenThreadMode THREAD_MODE = EWorldGenThreadMode.MULTI_THREADED;
public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.MULTI_THREADED;
//==============//
@@ -33,12 +36,11 @@ public class WorldGeneratorTestPrimary implements ICoreDhApiWorldGenerator
//======================//
@Override
public EWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
@Override
public IChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, ICoreDhApiLevelWrapper serverLevelWrapper, EWorldGenerationStep maxStepToGenerate)
public EDhApiWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
@Override
public IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate)
{
// not necessary for testing
return null;
}
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java
+11 -9
View File
@@ -1,7 +1,10 @@
package testItems.worldGeneratorInjection.objects;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.worldGenerator.ICoreDhApiWorldGenerator;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.world.ICoreDhApiLevelWrapper;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.api.items.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper;
import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.enums.worldGeneration.EWorldGenThreadMode;
import com.seibel.lod.core.enums.worldGeneration.EWorldGenerationStep;
import com.seibel.lod.core.dependencyInjection.OverrideInjector;
@@ -13,10 +16,10 @@ import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
* @author James Seibel
* @version 2022-8-9
*/
public class WorldGeneratorTestSecondary implements ICoreDhApiWorldGenerator
public class WorldGeneratorTestSecondary implements IDhApiWorldGenerator
{
public static int PRIORITY = OverrideInjector.DEFAULT_NON_CORE_OVERRIDE_PRIORITY;
public static EWorldGenThreadMode THREAD_MODE = EWorldGenThreadMode.SERVER_THREAD;
public static EDhApiWorldGenThreadMode THREAD_MODE = EDhApiWorldGenThreadMode.SERVER_THREAD;
//==============//
@@ -31,14 +34,13 @@ public class WorldGeneratorTestSecondary implements ICoreDhApiWorldGenerator
//======================//
// IDhApiWorldGenerator //
//======================//
@Override
public EWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
public EDhApiWorldGenThreadMode getCoreThreadingMode() { return THREAD_MODE; }
@Override
public IChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, ICoreDhApiLevelWrapper serverLevelWrapper, EWorldGenerationStep maxStepToGenerate)
public IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate)
{
// not necessary for testing
return null;
}
core/src/test/java/tests/DependencyInjectorTest.java
+8 -7
View File
@@ -1,7 +1,8 @@
package tests;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.worldGenerator.ICoreDhApiWorldGenerator;
import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.world.ICoreDhApiLevelWrapper;
import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.items.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.dependencyInjection.DependencyInjector;
import com.seibel.lod.core.dependencyInjection.IBindable;
import com.seibel.lod.core.dependencyInjection.OverrideInjector;
@@ -166,7 +167,7 @@ public class DependencyInjectorTest
// variables to use later
ICoreDhApiWorldGenerator generator;
IDhApiWorldGenerator generator;
WorldGeneratorTestCore coreGenerator = new WorldGeneratorTestCore();
WorldGeneratorTestSecondary secondaryGenerator = new WorldGeneratorTestSecondary();
WorldGeneratorTestPrimary primaryGenerator = new WorldGeneratorTestPrimary();
@@ -211,7 +212,7 @@ public class DependencyInjectorTest
// in-line get
// (make sure the returned type is correct and compiles, the actual value doesn't matter)
EWorldGenThreadMode threadMode = TEST_INJECTOR.get().getCoreThreadingMode();
EDhApiWorldGenThreadMode threadMode = TEST_INJECTOR.get().getCoreThreadingMode();
}
@@ -226,12 +227,12 @@ public class DependencyInjectorTest
// variables to use later
ICoreDhApiWorldGenerator generator;
IDhApiWorldGenerator generator;
WorldGeneratorTestCore backupGenerator = new WorldGeneratorTestCore();
WorldGeneratorTestPrimary levelGenerator = new WorldGeneratorTestPrimary();
ICoreDhApiLevelWrapper boundLevel = new LevelWrapperTest();
ICoreDhApiLevelWrapper unboundLevel = new LevelWrapperTest();
IDhApiLevelWrapper boundLevel = new LevelWrapperTest();
IDhApiLevelWrapper unboundLevel = new LevelWrapperTest();