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 9578e10f6..6bee378dc 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 @@ -21,7 +21,7 @@ package com.seibel.lod.api.enums; import com.seibel.lod.core.api.external.items.enums.override.DhApiOverrideEnumAssembly; import com.seibel.lod.api.items.enums.config.DhApiConfigEnumAssembly; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.DhApiWorldGenerationEnumAssembly; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.DhApiWorldGenerationEnumAssembly; /** * Assembly classes are used to reference the package they are in. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java index 38acc65bc..52c8120b3 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java @@ -1,7 +1,7 @@ package com.seibel.lod.api.items.interfaces.override; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiWorldGenThreadMode; import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; 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 e79d86d29..0857ba750 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.items.enums.worldGeneration.EDhApiLevelType; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiLevelType; /** * Can be either a Server or Client level. diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java b/api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java index 1ee361e9f..63e983adc 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java @@ -1,8 +1,8 @@ package com.seibel.lod.api.methods.config; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.interfaces.config.IConverter; -import com.seibel.lod.core.api.implementation.objects.DefaultConverter; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.config.IConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.DefaultConverter; import com.seibel.lod.core.config.types.ConfigEntry; /** diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java b/api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java index adabf6706..9af167821 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java @@ -23,7 +23,7 @@ import com.seibel.lod.api.items.enums.config.EDhApiDistanceGenerationMode; import com.seibel.lod.api.items.enums.config.EDhApiBlocksToAvoid; import com.seibel.lod.api.items.enums.config.EDhApiLightGenerationMode; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.GenericEnumConverter; import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.WorldGenerator; import com.seibel.lod.core.enums.config.EBlocksToAvoid; diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java index 412a1a365..34d1fbecb 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java @@ -21,7 +21,7 @@ package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.EDhApiGpuUploadMethod; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.GenericEnumConverter; import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Buffers; import com.seibel.lod.core.enums.config.EGpuUploadMethod; diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java index 715f92bd3..929ead609 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java @@ -21,7 +21,7 @@ package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.EDhApiDebugMode; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.GenericEnumConverter; import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; import com.seibel.lod.core.enums.rendering.EDebugMode; diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java index 990ba4c0e..fcd4ccb97 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java @@ -21,8 +21,8 @@ package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.*; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; -import com.seibel.lod.core.api.implementation.objects.RenderModeEnabledConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.GenericEnumConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.RenderModeEnabledConverter; import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.config.*; diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java index 29e4da106..40ff7725f 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java @@ -21,7 +21,7 @@ package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.*; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.GenericEnumConverter; import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.enums.rendering.*; import com.seibel.lod.core.config.Config.Client.Graphics.FogQuality; diff --git a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java index 4e6ae2f81..71a5da008 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java @@ -21,7 +21,7 @@ package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.EDhApiServerFolderNameMode; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; +import com.seibel.lod.core.api.external.coreImplementations.objects.converters.GenericEnumConverter; import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Multiplayer; import com.seibel.lod.core.enums.config.EServerFolderNameMode; diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java b/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java index abf5c502c..5c2d96f67 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.methods.events; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; import com.seibel.lod.core.api.external.items.objects.DhApiResult; import com.seibel.lod.core.handlers.dependencyInjection.DhApiEventInjector; diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java index a952a4d03..8c71ff66e 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.api.methods.events.interfaces; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; /** 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 9013a1ed1..d1e27acc1 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,7 +22,7 @@ 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.implementation.wrappers.DhApiLevelWrapper; +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; 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 da6662810..cc85a4bf3 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 @@ -26,7 +26,7 @@ import com.seibel.lod.core.a7.world.IServerWorld; import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiLevelLoadEvent; import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiLevelSaveEvent; import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiLevelUnloadEvent; -import com.seibel.lod.core.api.implementation.wrappers.DhApiLevelWrapper; +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; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java index 9449e2a76..48c7f1751 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/DhApiWorldGenerationEnumAssembly.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.items.enums.worldGeneration; +package com.seibel.lod.core.api.external.coreImplementations.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/items/enums/worldGeneration/EDhApiLevelType.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiLevelType.java similarity index 69% rename from core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiLevelType.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiLevelType.java index 07b9d812a..94d747fe1 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiLevelType.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiLevelType.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.items.enums.worldGeneration; +package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; /** * SERVER_LEVEL,
diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenThreadMode.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenThreadMode.java index ea9739b9b..9ab984c87 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenThreadMode.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.items.enums.worldGeneration; +package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; /** * MULTI_THREADED,
diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiWorldGenerationStep.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenerationStep.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiWorldGenerationStep.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenerationStep.java index 46c756f87..3061b4426 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/enums/worldGeneration/EDhApiWorldGenerationStep.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/enums/worldGeneration/EDhApiWorldGenerationStep.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.items.enums.worldGeneration; +package com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration; /** * EMPTY,
diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/interfaces/config/IConverter.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/config/IConverter.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/api/implementation/interfaces/config/IConverter.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/config/IConverter.java index 38ad507c3..6a7d7f674 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/interfaces/config/IConverter.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/config/IConverter.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.implementation.interfaces.config; +package com.seibel.lod.core.api.external.coreImplementations.interfaces.config; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/interfaces/events/ICoreDhApiEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/events/ICoreDhApiEvent.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/api/implementation/interfaces/events/ICoreDhApiEvent.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/events/ICoreDhApiEvent.java index 7f3ca4b4d..a6508b0d2 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/interfaces/events/ICoreDhApiEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/events/ICoreDhApiEvent.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.implementation.interfaces.events; +package com.seibel.lod.core.api.external.coreImplementations.interfaces.events; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/objects/DefaultConverter.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/DefaultConverter.java similarity index 70% rename from core/src/main/java/com/seibel/lod/core/api/implementation/objects/DefaultConverter.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/DefaultConverter.java index 38b4f5d0c..846512a7b 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/objects/DefaultConverter.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/DefaultConverter.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.api.implementation.objects; +package com.seibel.lod.core.api.external.coreImplementations.objects.converters; -import com.seibel.lod.core.api.implementation.interfaces.config.IConverter; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.config.IConverter; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/objects/GenericEnumConverter.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/GenericEnumConverter.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/api/implementation/objects/GenericEnumConverter.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/GenericEnumConverter.java index 69d428083..5ace88ac0 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/objects/GenericEnumConverter.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/GenericEnumConverter.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.api.implementation.objects; +package com.seibel.lod.core.api.external.coreImplementations.objects.converters; -import com.seibel.lod.core.api.implementation.interfaces.config.IConverter; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.config.IConverter; /** * This assumes the two enums contain the same values. diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/objects/RenderModeEnabledConverter.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/RenderModeEnabledConverter.java similarity index 76% rename from core/src/main/java/com/seibel/lod/core/api/implementation/objects/RenderModeEnabledConverter.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/RenderModeEnabledConverter.java index bb5a3f093..86edf9c92 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/objects/RenderModeEnabledConverter.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/converters/RenderModeEnabledConverter.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.api.implementation.objects; +package com.seibel.lod.core.api.external.coreImplementations.objects.converters; -import com.seibel.lod.core.api.implementation.interfaces.config.IConverter; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.config.IConverter; import com.seibel.lod.core.enums.rendering.ERendererMode; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterDhInitEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterDhInitEvent.java index a6ca1524f..cce54aff9 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterDhInitEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterDhInitEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterRenderEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterRenderEvent.java index 38052c978..cc0decb5b 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterRenderEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiAfterRenderEvent.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; import com.seibel.lod.core.api.external.coreImplementations.objects.events.sharedParameterObjects.CoreDhApiRenderParam; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeDhInitEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeDhInitEvent.java index e660a23a8..60d1b0410 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeDhInitEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeDhInitEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeRenderEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeRenderEvent.java index 4a4ff456f..aa7d5295a 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeRenderEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiBeforeRenderEvent.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; import com.seibel.lod.core.api.external.coreImplementations.objects.events.sharedParameterObjects.CoreDhApiRenderParam; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelLoadEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelLoadEvent.java index 4b4b4ce3c..9d61dd2ca 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelLoadEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelLoadEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelSaveEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelSaveEvent.java index 71a3e2e92..cbcd11e61 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelSaveEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelSaveEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelUnloadEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelUnloadEvent.java index afec2f211..7eafb1a47 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelUnloadEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/abstractEvents/CoreDhApiLevelUnloadEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.coreImplementations.objects.events.abstractEvents; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiDimensionTypeWrapper.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/wrappers/DhApiDimensionTypeWrapper.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiDimensionTypeWrapper.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/wrappers/DhApiDimensionTypeWrapper.java index 36d80175d..9117de4dd 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiDimensionTypeWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/wrappers/DhApiDimensionTypeWrapper.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.implementation.wrappers; +package com.seibel.lod.core.api.external.coreImplementations.objects.wrappers; import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiLevelWrapper.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/wrappers/DhApiLevelWrapper.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiLevelWrapper.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/wrappers/DhApiLevelWrapper.java index b8f7555b3..88c85372b 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiLevelWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/wrappers/DhApiLevelWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.implementation.wrappers; +package com.seibel.lod.core.api.external.coreImplementations.objects.wrappers; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiLevelType; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiLevelType; import com.seibel.lod.core.api.external.items.interfaces.IDhApiUnsafeWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; diff --git a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java index 9c818eb6e..fc4164f21 100644 --- a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java +++ b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.handlers.dependencyInjection; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/test/java/testItems/eventInjection/abstractObjects/DhApiTestEvent.java b/core/src/test/java/testItems/eventInjection/abstractObjects/DhApiTestEvent.java index c8247173b..2f09c7546 100644 --- a/core/src/test/java/testItems/eventInjection/abstractObjects/DhApiTestEvent.java +++ b/core/src/test/java/testItems/eventInjection/abstractObjects/DhApiTestEvent.java @@ -1,6 +1,6 @@ package testItems.eventInjection.abstractObjects; -import com.seibel.lod.core.api.implementation.interfaces.events.ICoreDhApiEvent; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.events.ICoreDhApiEvent; /** * A dummy event implementation used for unit testing. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java index 52b527d0c..699c4a0ef 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java @@ -1,6 +1,6 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiLevelType; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiLevelType; import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java index f7826cbb4..6564ec851 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java @@ -1,8 +1,8 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.core.api.external.items.enums.override.EDhApiOverridePriority; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiWorldGenerationStep; import com.seibel.lod.api.items.interfaces.override.IDhApiWorldGenerator; import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java index a995fce5a..7c73daedc 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java @@ -1,8 +1,8 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.core.api.external.items.enums.override.EDhApiOverridePriority; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.core.api.external.coreImplementations.enums.worldGeneration.EDhApiWorldGenerationStep; import com.seibel.lod.api.items.interfaces.override.IDhApiWorldGenerator; import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper; import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper;