diff --git a/api/src/main/java/com/seibel/lod/api/enums/DhApiEnumAssembly.java b/api/src/main/java/com/seibel/lod/api/enums/DhApiEnumAssembly.java index e6e2c5e66..f27545510 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/DhApiEnumAssembly.java +++ b/api/src/main/java/com/seibel/lod/api/enums/DhApiEnumAssembly.java @@ -20,7 +20,7 @@ package com.seibel.lod.api.enums; import com.seibel.lod.api.items.enums.config.DhApiConfigEnumAssembly; -import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.DhApiWorldGenerationEnumAssembly; +import com.seibel.lod.api.items.enums.worldGeneration.DhApiWorldGenerationEnumAssembly; /** * Assembly classes are used to reference the package they are in. diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java rename to api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java index 48c7f1751..46ca55d09 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java +++ b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; +package com.seibel.lod.api.items.enums.worldGeneration; /** * Assembly classes are used to reference the package they are in. diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiLevelType.java b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiLevelType.java similarity index 69% rename from core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiLevelType.java rename to api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiLevelType.java index 94d747fe1..047475f31 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiLevelType.java +++ b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiLevelType.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; +package com.seibel.lod.api.items.enums.worldGeneration; /** * SERVER_LEVEL,
diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenThreadMode.java b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenThreadMode.java rename to api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java index 9ab984c87..5a460622a 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenThreadMode.java +++ b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; +package com.seibel.lod.api.items.enums.worldGeneration; /** * MULTI_THREADED,
diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenerationStep.java b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenerationStep.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenerationStep.java rename to api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenerationStep.java index 3061b4426..6c8c12355 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenerationStep.java +++ b/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenerationStep.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; +package com.seibel.lod.api.items.enums.worldGeneration; /** * EMPTY,
diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java index d1935eca5..9191efe70 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java @@ -20,7 +20,7 @@ package com.seibel.lod.api.items.interfaces.world; import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; -import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiLevelType; +import com.seibel.lod.api.items.enums.worldGeneration.EDhApiLevelType; import com.seibel.lod.core.api.external.coreImplementations.interfaces.wrappers.world.ICoreDhApiLevelWrapper; /** diff --git a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java index 32938b433..14f3506c3 100644 --- a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java +++ b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java @@ -22,12 +22,10 @@ package com.seibel.lod.core.api.internal.a7; import com.seibel.lod.core.a7.level.IClientLevel; import com.seibel.lod.core.a7.world.*; import com.seibel.lod.core.api.external.coreImplementations.objects.events.sharedParameterObjects.CoreDhApiRenderParam; -import com.seibel.lod.core.api.external.coreImplementations.objects.wrappers.DhApiLevelWrapper; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.enums.rendering.EDebugMode; import com.seibel.lod.core.enums.rendering.ERendererMode; -import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.ConfigBasedSpamLogger; diff --git a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java index b9f2da7fa..08f6895ad 100644 --- a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java +++ b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java @@ -23,8 +23,6 @@ import com.seibel.lod.core.a7.level.ILevel; import com.seibel.lod.core.a7.world.DhClientServerWorld; import com.seibel.lod.core.a7.world.DhServerWorld; import com.seibel.lod.core.a7.world.IServerWorld; -import com.seibel.lod.core.api.external.coreImplementations.objects.wrappers.DhApiLevelWrapper; -import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; import com.seibel.lod.core.handlers.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java index 5822b5288..af5668288 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java @@ -1,7 +1,5 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiLevelType; - /** * Stub implementation of a Level wrapper for basic unit testing. *