diff --git a/api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java b/api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java index 4b5d64be3..6d1ad1aa9 100644 --- a/api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java +++ b/api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java @@ -22,7 +22,7 @@ package com.seibel.lod.api.config.both; import com.seibel.lod.core.api.external.items.enums.config.EDhApiDistanceGenerationMode; import com.seibel.lod.core.api.external.items.enums.config.EDhApiBlocksToAvoid; import com.seibel.lod.core.api.external.items.enums.config.EDhApiLightGenerationMode; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +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.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.WorldGenerator; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java b/api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java index 5db31861f..328f1ce74 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java +++ b/api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java @@ -20,7 +20,7 @@ package com.seibel.lod.api.config.client; import com.seibel.lod.core.api.external.items.enums.config.EDhApiGpuUploadMethod; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +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.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Buffers; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java b/api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java index 53fa160d3..5903f6362 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java +++ b/api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java @@ -20,7 +20,7 @@ package com.seibel.lod.api.config.client; import com.seibel.lod.core.api.external.items.enums.config.EDhApiDebugMode; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +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.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java b/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java index 76fea3a32..12f566cc1 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java +++ b/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java @@ -19,7 +19,7 @@ package com.seibel.lod.api.config.client; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.external.items.enums.config.*; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.objects.RenderModeEnabledConverter; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java b/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java index b4e3ada25..b20f5331b 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java +++ b/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java @@ -19,7 +19,7 @@ package com.seibel.lod.api.config.client; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.external.items.enums.config.*; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java b/api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java index 8ca1beda7..43b03649d 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java +++ b/api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java @@ -20,7 +20,7 @@ package com.seibel.lod.api.config.client; import com.seibel.lod.core.api.external.items.enums.config.EDhApiServerFolderNameMode; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +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.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Multiplayer; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java b/api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java index 9a7e1d84d..5fd83fd25 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java +++ b/api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java @@ -19,7 +19,7 @@ package com.seibel.lod.api.config.client; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Threading; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/IDhApiUnsafeWrapper.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/IDhApiUnsafeWrapper.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/IDhApiUnsafeWrapper.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/IDhApiUnsafeWrapper.java index 4c5631222..c315a4f7d 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/IDhApiUnsafeWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/IDhApiUnsafeWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.items.interfaces; +package com.seibel.lod.api.items.interfaces; /** * The Distant Horizons' API objects can't cover diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/config/IDhApiConfig.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfig.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/config/IDhApiConfig.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfig.java index 877d6baa6..345f2f0b5 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/config/IDhApiConfig.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfig.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.items.interfaces.config; +package com.seibel.lod.api.items.interfaces.config; /** * An interface for Distant Horizon's Config. diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/override/IDhApiOverrideable.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/override/IDhApiOverrideable.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java index b04ec2511..c05a03502 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/override/IDhApiOverrideable.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.items.interfaces.override; +package com.seibel.lod.api.items.interfaces.override; import com.seibel.lod.core.api.external.items.enums.override.EDhApiOverridePriority; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/override/IDhApiWorldGenerator.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java similarity index 71% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/override/IDhApiWorldGenerator.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java index 9b7f28eb4..38acc65bc 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/override/IDhApiWorldGenerator.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiWorldGenerator.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.api.external.items.interfaces.override; +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.items.interfaces.world.IDhApiChunkWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiChunkWrapper.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiChunkWrapper.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiChunkWrapper.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiChunkWrapper.java index 60cd6ddad..4c5ef4c1a 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiChunkWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiChunkWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.items.interfaces.world; +package com.seibel.lod.api.items.interfaces.world; -import com.seibel.lod.core.api.external.items.interfaces.IDhApiUnsafeWrapper; +import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiDimensionTypeWrapper.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiDimensionTypeWrapper.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiDimensionTypeWrapper.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiDimensionTypeWrapper.java index e3cf78497..f3168696b 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiDimensionTypeWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiDimensionTypeWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.items.interfaces.world; +package com.seibel.lod.api.items.interfaces.world; -import com.seibel.lod.core.api.external.items.interfaces.IDhApiUnsafeWrapper; +import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiLevelWrapper.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiLevelWrapper.java rename to api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java index 49c4b7cf8..e79d86d29 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/items/interfaces/world/IDhApiLevelWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.items.interfaces.world; +package com.seibel.lod.api.items.interfaces.world; -import com.seibel.lod.core.api.external.items.interfaces.IDhApiUnsafeWrapper; +import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiLevelType; /** diff --git a/api/src/main/java/com/seibel/lod/api/override/DhApiWorldGeneratorOverrideRegister.java b/api/src/main/java/com/seibel/lod/api/override/DhApiWorldGeneratorOverrideRegister.java index 1b5c3199b..5b79d616d 100644 --- a/api/src/main/java/com/seibel/lod/api/override/DhApiWorldGeneratorOverrideRegister.java +++ b/api/src/main/java/com/seibel/lod/api/override/DhApiWorldGeneratorOverrideRegister.java @@ -1,7 +1,7 @@ package com.seibel.lod.api.override; -import com.seibel.lod.core.api.external.items.interfaces.override.IDhApiWorldGenerator; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.override.IDhApiWorldGenerator; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.api.items.objects.DhApiResult; import com.seibel.lod.core.handlers.dependencyInjection.WorldGeneratorInjector; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelLoadEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelLoadEvent.java index da9f96254..a82174d7b 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelLoadEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelLoadEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.methods.events.abstractEvents; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelSaveEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelSaveEvent.java index c96666263..803b4d91a 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelSaveEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelSaveEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.methods.events.abstractEvents; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelUnloadEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelUnloadEvent.java index 6ee6decc3..992405ffe 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelUnloadEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiLevelUnloadEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.methods.events.abstractEvents; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java b/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java index 03859b4a8..bddd0f5ef 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.implementation.wrappers; -import com.seibel.lod.core.api.external.items.interfaces.config.IDhApiConfig; +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.config.types.ConfigEntry; 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/implementation/wrappers/DhApiDimensionTypeWrapper.java index a6ea553e9..36d80175d 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/implementation/wrappers/DhApiDimensionTypeWrapper.java @@ -19,13 +19,9 @@ package com.seibel.lod.core.api.implementation.wrappers; -import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; /** * @author James Seibel 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/implementation/wrappers/DhApiLevelWrapper.java index 56fd0fa51..b8f7555b3 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/implementation/wrappers/DhApiLevelWrapper.java @@ -21,8 +21,8 @@ package com.seibel.lod.core.api.implementation.wrappers; import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiLevelType; import com.seibel.lod.core.api.external.items.interfaces.IDhApiUnsafeWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; diff --git a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/OverrideInjector.java b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/OverrideInjector.java index d108bb968..8ec7a73fc 100644 --- a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/OverrideInjector.java +++ b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/OverrideInjector.java @@ -20,7 +20,7 @@ package com.seibel.lod.core.handlers.dependencyInjection; import com.seibel.lod.core.api.external.items.enums.override.EDhApiOverridePriority; -import com.seibel.lod.core.api.external.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.enums.override.EOverridePriority; import com.seibel.lod.core.util.StringUtil; diff --git a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/WorldGeneratorInjector.java b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/WorldGeneratorInjector.java index b4fd51f39..c903a5e9e 100644 --- a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/WorldGeneratorInjector.java +++ b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/WorldGeneratorInjector.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.handlers.dependencyInjection; -import com.seibel.lod.core.api.external.items.interfaces.override.IDhApiWorldGenerator; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.override.IDhApiWorldGenerator; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.util.StringUtil; import java.util.HashMap; diff --git a/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java b/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java index 7d059b88f..df5847564 100644 --- a/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java +++ b/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java @@ -1,6 +1,6 @@ package testItems.overrideInjection.interfaces; -import com.seibel.lod.core.api.external.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable; /** * Dummy override test interface for dependency unit tests. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java index 202e6c214..52b527d0c 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java @@ -1,8 +1,8 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.core.api.external.items.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +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. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java index e3950edf6..f7826cbb4 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java @@ -3,9 +3,9 @@ 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.items.interfaces.override.IDhApiWorldGenerator; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiChunkWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +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; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java index c4549ff18..a995fce5a 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java @@ -3,9 +3,9 @@ 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.items.interfaces.override.IDhApiWorldGenerator; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiChunkWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +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; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java index 9e13a9456..2722beb47 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java @@ -3,9 +3,9 @@ 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.items.interfaces.override.IDhApiWorldGenerator; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiChunkWrapper; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +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; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/tests/DependencyInjectorTest.java b/core/src/test/java/tests/DependencyInjectorTest.java index bf3a770f5..4e671c056 100644 --- a/core/src/test/java/tests/DependencyInjectorTest.java +++ b/core/src/test/java/tests/DependencyInjectorTest.java @@ -1,9 +1,9 @@ package tests; import com.seibel.lod.core.api.external.items.enums.override.EDhApiOverridePriority; -import com.seibel.lod.core.api.external.items.interfaces.override.IDhApiOverrideable; -import com.seibel.lod.core.api.external.items.interfaces.override.IDhApiWorldGenerator; -import com.seibel.lod.core.api.external.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.items.interfaces.override.IDhApiWorldGenerator; +import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.enums.override.EOverridePriority; import com.seibel.lod.core.handlers.dependencyInjection.*;