diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EBlocksToAvoid.java b/api/src/main/java/com/seibel/lod/api/enums/config/EBlocksToAvoid.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EBlocksToAvoid.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EBlocksToAvoid.java index 4ffdd38dd..b57c26195 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EBlocksToAvoid.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EBlocksToAvoid.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * NONE,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EBufferRebuildTimes.java b/api/src/main/java/com/seibel/lod/api/enums/config/EBufferRebuildTimes.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EBufferRebuildTimes.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EBufferRebuildTimes.java index 4e697fe54..c048e3c09 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EBufferRebuildTimes.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EBufferRebuildTimes.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * CONSTANT
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EDistanceGenerationMode.java b/api/src/main/java/com/seibel/lod/api/enums/config/EDistanceGenerationMode.java similarity index 98% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EDistanceGenerationMode.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EDistanceGenerationMode.java index daf69261b..bf8bf9b63 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EDistanceGenerationMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EDistanceGenerationMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * NONE
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EGenerationPriority.java b/api/src/main/java/com/seibel/lod/api/enums/config/EGenerationPriority.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EGenerationPriority.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EGenerationPriority.java index 255c497eb..37709abf9 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EGenerationPriority.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EGenerationPriority.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * AUTO
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EGpuUploadMethod.java b/api/src/main/java/com/seibel/lod/api/enums/config/EGpuUploadMethod.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EGpuUploadMethod.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EGpuUploadMethod.java index 53b41ef46..3fdd478bb 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EGpuUploadMethod.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EGpuUploadMethod.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * AUTO,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalQuality.java b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalQuality.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalQuality.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalQuality.java index 98192f164..6c75fd58c 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalQuality.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalQuality.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * LOWEST
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalResolution.java b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java similarity index 99% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalResolution.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java index a25fc4ecc..0428c2c4a 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalResolution.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; import java.util.ArrayList; import java.util.Collections; diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalScale.java b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalScale.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalScale.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalScale.java index ecb8db89c..ca3fe5b0f 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EHorizontalScale.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalScale.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * Low
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/ELightGenerationMode.java b/api/src/main/java/com/seibel/lod/api/enums/config/ELightGenerationMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/ELightGenerationMode.java rename to api/src/main/java/com/seibel/lod/api/enums/config/ELightGenerationMode.java index 9badd1dcf..8518b74d1 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/ELightGenerationMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/ELightGenerationMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * FAST,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/ELoggerMode.java b/api/src/main/java/com/seibel/lod/api/enums/config/ELoggerMode.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/ELoggerMode.java rename to api/src/main/java/com/seibel/lod/api/enums/config/ELoggerMode.java index face70155..6b1069c82 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/ELoggerMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/ELoggerMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; import org.apache.logging.log4j.Level; public enum ELoggerMode diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EServerFolderNameMode.java b/api/src/main/java/com/seibel/lod/api/enums/config/EServerFolderNameMode.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EServerFolderNameMode.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EServerFolderNameMode.java index 6961a82c8..da4bda15b 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EServerFolderNameMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EServerFolderNameMode.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * AUTO,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EShadingMode.java b/api/src/main/java/com/seibel/lod/api/enums/config/EShadingMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EShadingMode.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EShadingMode.java index 06e952411..6c35599db 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EShadingMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EShadingMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * NONE, GAME_SHADING diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EVanillaOverdraw.java b/api/src/main/java/com/seibel/lod/api/enums/config/EVanillaOverdraw.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EVanillaOverdraw.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EVanillaOverdraw.java index 9d5b4f7dd..ff2d47feb 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EVanillaOverdraw.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EVanillaOverdraw.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * NEVER,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/config/EVerticalQuality.java b/api/src/main/java/com/seibel/lod/api/enums/config/EVerticalQuality.java similarity index 98% rename from api/src/main/java/com/seibel/lod/api/items/enums/config/EVerticalQuality.java rename to api/src/main/java/com/seibel/lod/api/enums/config/EVerticalQuality.java index 99aafc4a5..707a38d33 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/config/EVerticalQuality.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EVerticalQuality.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.config; +package com.seibel.lod.api.enums.config; /** * heightmap
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EDebugMode.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugMode.java similarity index 98% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EDebugMode.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugMode.java index 2744e597a..2ac01c6a2 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EDebugMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * OFF,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogColorMode.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogColorMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogColorMode.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EFogColorMode.java index bc43215b6..0f4f0f8cd 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogColorMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogColorMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * USE_DEFAULT_FOG_COLOR,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogDistance.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDistance.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogDistance.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDistance.java index 0a39a143a..0112f6c55 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogDistance.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDistance.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * NEAR, FAR, or NEAR_AND_FAR. diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogDrawMode.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDrawMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogDrawMode.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDrawMode.java index 7843338ed..181d678d6 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogDrawMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDrawMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * USE_OPTIFINE_FOG_SETTING,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogFalloff.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogFalloff.java similarity index 87% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogFalloff.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EFogFalloff.java index 350cfaf60..037e53d00 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EFogFalloff.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogFalloff.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * LINEAR,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EGLProxyContext.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EGLProxyContext.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EGLProxyContext.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EGLProxyContext.java index 19d47f32d..ad231fad6 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EGLProxyContext.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EGLProxyContext.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * Minecraft, Lod_Builder, None diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EHeightFogMixMode.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMixMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EHeightFogMixMode.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMixMode.java index a3f0b8c64..ca93878f7 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EHeightFogMixMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMixMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * BASIC
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EHeightFogMode.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMode.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/EHeightFogMode.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMode.java index d1a26e0b0..90dde7785 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/EHeightFogMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * ABOVE_CAMERA,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/ERendererMode.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/ERendererMode.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/ERendererMode.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/ERendererMode.java index faa9ebae1..9270479f9 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/ERendererMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/ERendererMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * Default diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/ETransparency.java b/api/src/main/java/com/seibel/lod/api/enums/rendering/ETransparency.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/items/enums/rendering/ETransparency.java rename to api/src/main/java/com/seibel/lod/api/enums/rendering/ETransparency.java index d1a66661a..942f8c10a 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/rendering/ETransparency.java +++ b/api/src/main/java/com/seibel/lod/api/enums/rendering/ETransparency.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.enums.rendering; +package com.seibel.lod.api.enums.rendering; /** * OFF,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiLevelType.java b/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiLevelType.java similarity index 77% rename from api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiLevelType.java rename to api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiLevelType.java index 047475f31..63039bcb2 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiLevelType.java +++ b/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiLevelType.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.enums.worldGeneration; +package com.seibel.lod.api.enums.worldGeneration; /** * SERVER_LEVEL,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java b/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java similarity index 90% rename from api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java rename to api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java index 5a460622a..8b3083ffa 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenThreadMode.java +++ b/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.enums.worldGeneration; +package com.seibel.lod.api.enums.worldGeneration; /** * MULTI_THREADED,
diff --git a/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenerationStep.java b/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenerationStep.java similarity index 88% rename from api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenerationStep.java rename to api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenerationStep.java index 6c8c12355..132b28eb2 100644 --- a/api/src/main/java/com/seibel/lod/api/items/enums/worldGeneration/EDhApiWorldGenerationStep.java +++ b/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenerationStep.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.enums.worldGeneration; +package com.seibel.lod.api.enums.worldGeneration; /** * EMPTY,
diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/IDhApiUnsafeWrapper.java b/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java similarity index 94% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/IDhApiUnsafeWrapper.java rename to api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java index a1e2e8c06..b5c3e18c4 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/IDhApiUnsafeWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.interfaces; +package com.seibel.lod.api.interfaces; /** * The Distant Horizons' API objects can't cover diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfig.java new file mode 100644 index 000000000..b4859341b --- /dev/null +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfig.java @@ -0,0 +1,25 @@ +package com.seibel.lod.api.interfaces.config; + +import com.seibel.lod.api.interfaces.config.both.IDhApiWorldGenerationConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiBuffersConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiGraphicsConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiMultiplayerConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiThreadingConfig; + +/** + * This interfaces holds all of the config groups + * the API has access to for easy access to all config values. + * + * @author James Seibel + * @version 9-15-2022 + */ +public interface IDhApiConfig +{ + + IDhApiWorldGenerationConfig getWorldGeneratorConfig(); + IDhApiBuffersConfig getBufferConfig(); + IDhApiGraphicsConfig getGraphicsConfig(); + IDhApiMultiplayerConfig getMultiplayerConfig(); + IDhApiThreadingConfig getThreadingConfig(); + +} diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfigGroup.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java similarity index 85% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfigGroup.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java index 94fca3292..5e9193725 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfigGroup.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.interfaces.config; +package com.seibel.lod.api.interfaces.config; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfigValue.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigValue.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfigValue.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigValue.java index 7c28c19e5..1e2660fb8 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfigValue.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigValue.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.interfaces.config; +package com.seibel.lod.api.interfaces.config; /** * An interface for Distant Horizon's Config. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/both/IDhApiWorldGenerationConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/both/IDhApiWorldGenerationConfig.java similarity index 84% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/both/IDhApiWorldGenerationConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/both/IDhApiWorldGenerationConfig.java index 61c3f67fb..c5c9fea4e 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/both/IDhApiWorldGenerationConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/both/IDhApiWorldGenerationConfig.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.both; +package com.seibel.lod.api.interfaces.config.both; -import com.seibel.lod.api.items.enums.config.EBlocksToAvoid; -import com.seibel.lod.api.items.enums.config.EDistanceGenerationMode; -import com.seibel.lod.api.items.enums.config.EGenerationPriority; -import com.seibel.lod.api.items.enums.config.ELightGenerationMode; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.enums.config.EBlocksToAvoid; +import com.seibel.lod.api.enums.config.EDistanceGenerationMode; +import com.seibel.lod.api.enums.config.EGenerationPriority; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.enums.config.ELightGenerationMode; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' world generation configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiBuffersConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiBuffersConfig.java similarity index 84% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiBuffersConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiBuffersConfig.java index fc176afbc..bfd17d67d 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiBuffersConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiBuffersConfig.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.client; +package com.seibel.lod.api.interfaces.config.client; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; /** * Distant Horizons' OpenGL buffer configuration. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiDebuggingConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiDebuggingConfig.java similarity index 82% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiDebuggingConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiDebuggingConfig.java index d91593abd..79f14a445 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiDebuggingConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiDebuggingConfig.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.client; +package com.seibel.lod.api.interfaces.config.client; -import com.seibel.lod.api.items.enums.rendering.EDebugMode; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.enums.rendering.EDebugMode; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' debug configuration. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiGraphicsConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsConfig.java similarity index 94% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiGraphicsConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsConfig.java index 9fe1a7dc3..52b746ff7 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiGraphicsConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsConfig.java @@ -17,12 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.client; +package com.seibel.lod.api.interfaces.config.client; +import com.seibel.lod.api.enums.config.*; +import com.seibel.lod.api.enums.rendering.ERendererMode; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; import com.seibel.lod.api.items.enums.config.*; -import com.seibel.lod.api.items.enums.rendering.ERendererMode; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' graphics/rendering configuration. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiGraphicsFogConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsFogConfig.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiGraphicsFogConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsFogConfig.java index 221e88276..3802a617b 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiGraphicsFogConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsFogConfig.java @@ -17,11 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.client; +package com.seibel.lod.api.interfaces.config.client; +import com.seibel.lod.api.enums.rendering.*; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; import com.seibel.lod.api.items.enums.rendering.*; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' fog configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiMultiplayerConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiplayerConfig.java similarity index 86% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiMultiplayerConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiplayerConfig.java index 0541ea72a..994337fcf 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiMultiplayerConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiplayerConfig.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.client; +package com.seibel.lod.api.interfaces.config.client; -import com.seibel.lod.api.items.enums.config.EServerFolderNameMode; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.enums.config.EServerFolderNameMode; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' client-side multiplayer configuration. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiThreadingConfig.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiThreadingConfig.java similarity index 91% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiThreadingConfig.java rename to api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiThreadingConfig.java index b49f17aae..2069a7cd6 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/client/IDhApiThreadingConfig.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiThreadingConfig.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.config.client; +package com.seibel.lod.api.interfaces.config.client; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigGroup; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' threading configuration. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/AbstractDhApiWorldGenerator.java b/api/src/main/java/com/seibel/lod/api/interfaces/override/AbstractDhApiWorldGenerator.java similarity index 71% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/override/AbstractDhApiWorldGenerator.java rename to api/src/main/java/com/seibel/lod/api/interfaces/override/AbstractDhApiWorldGenerator.java index ebc66b6c4..3db8c905b 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/AbstractDhApiWorldGenerator.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/override/AbstractDhApiWorldGenerator.java @@ -1,9 +1,9 @@ -package com.seibel.lod.api.items.interfaces.override; +package com.seibel.lod.api.interfaces.override; -import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.api.items.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java b/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java similarity index 90% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java rename to api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java index 6aee08848..083053a18 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.interfaces.override; +package com.seibel.lod.api.interfaces.override; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; import com.seibel.lod.core.interfaces.dependencyInjection.IOverrideInjector; diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java b/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java new file mode 100644 index 000000000..29f2b2771 --- /dev/null +++ b/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java @@ -0,0 +1,20 @@ +package com.seibel.lod.api.interfaces.override.worldGenerator; + +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; + +/** + * @author James Seibel + * @version 2022-9-8 + */ +public interface IDhApiWorldGenerator extends IDhApiOverrideable +{ + /** Returns which thread chunk generation requests can be created on. */ + EDhApiWorldGenThreadMode getCoreThreadingMode(); + + IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate); + +} diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiChunkWrapper.java b/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiChunkWrapper.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiChunkWrapper.java rename to api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiChunkWrapper.java index 4c5ef4c1a..2700a9a29 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiChunkWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiChunkWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.world; +package com.seibel.lod.api.interfaces.world; -import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; +import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiDimensionTypeWrapper.java b/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiDimensionTypeWrapper.java similarity index 89% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiDimensionTypeWrapper.java rename to api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiDimensionTypeWrapper.java index 872f20828..029c71d7d 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiDimensionTypeWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiDimensionTypeWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.world; +package com.seibel.lod.api.interfaces.world; -import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; +import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel 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/interfaces/world/IDhApiLevelWrapper.java similarity index 86% rename from api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java rename to api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiLevelWrapper.java index 0409b1c9b..bbd497830 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/world/IDhApiLevelWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiLevelWrapper.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.items.interfaces.world; +package com.seibel.lod.api.interfaces.world; -import com.seibel.lod.api.items.interfaces.IDhApiUnsafeWrapper; -import com.seibel.lod.api.items.enums.worldGeneration.EDhApiLevelType; +import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; +import com.seibel.lod.api.enums.worldGeneration.EDhApiLevelType; /** * Can be either a Server or Client level. diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfig.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfig.java deleted file mode 100644 index dde857bc0..000000000 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/config/IDhApiConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.seibel.lod.api.items.interfaces.config; - -import com.seibel.lod.api.items.interfaces.config.both.IDhApiWorldGenerationConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiBuffersConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiGraphicsConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiMultiplayerConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiThreadingConfig; - -/** - * This interfaces holds all of the config groups - * the API has access to for easy access to all config values. - * - * @author James Seibel - * @version 9-15-2022 - */ -public interface IDhApiConfig -{ - - IDhApiWorldGenerationConfig getWorldGeneratorConfig(); - IDhApiBuffersConfig getBufferConfig(); - IDhApiGraphicsConfig getGraphicsConfig(); - IDhApiMultiplayerConfig getMultiplayerConfig(); - IDhApiThreadingConfig getThreadingConfig(); - -} diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/worldGenerator/IDhApiWorldGenerator.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/worldGenerator/IDhApiWorldGenerator.java deleted file mode 100644 index 62154137b..000000000 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/worldGenerator/IDhApiWorldGenerator.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.seibel.lod.api.items.interfaces.override.worldGenerator; - -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.IDhApiOverrideable; -import com.seibel.lod.api.items.interfaces.world.IDhApiChunkWrapper; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; - -/** - * @author James Seibel - * @version 2022-9-8 - */ -public interface IDhApiWorldGenerator extends IDhApiOverrideable -{ - /** Returns which thread chunk generation requests can be created on. */ - EDhApiWorldGenThreadMode getCoreThreadingMode(); - - IDhApiChunkWrapper generateCoreChunk(int chunkPosX, int chunkPosZ, IDhApiLevelWrapper serverLevelWrapper, EDhApiWorldGenerationStep maxStepToGenerate); - -} 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 51ba87d9b..4ae6b122c 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,10 +1,8 @@ package com.seibel.lod.api.methods.events; -import com.seibel.lod.api.items.objects.DhApiResult; +import com.seibel.lod.api.objects.DhApiResult; import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.DhApiMain; import com.seibel.lod.core.DependencyInjection.DhApiEventInjector; -import com.seibel.lod.core.interfaces.dependencyInjection.IDhApiEventInjector; /** * Handles adding/removing event handlers. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java index 2d5f147e7..549cb0303 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.api.methods.events.abstractEvents; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; /** diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java index e64675489..f304cb703 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.api.methods.events.abstractEvents; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; /** diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java index 30c8ee0d4..ddd3a87c4 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.api.methods.events.abstractEvents; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; /** diff --git a/api/src/main/java/com/seibel/lod/api/items/objects/DhApiResult.java b/api/src/main/java/com/seibel/lod/api/objects/DhApiResult.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/items/objects/DhApiResult.java rename to api/src/main/java/com/seibel/lod/api/objects/DhApiResult.java index bf7363f7b..285baef31 100644 --- a/api/src/main/java/com/seibel/lod/api/items/objects/DhApiResult.java +++ b/api/src/main/java/com/seibel/lod/api/objects/DhApiResult.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.objects; +package com.seibel.lod.api.objects; /** * Allows for more descriptive non-critical failure states. diff --git a/api/src/main/java/com/seibel/lod/api/items/objects/config/DhApiConfigValue.java b/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java similarity index 93% rename from api/src/main/java/com/seibel/lod/api/items/objects/config/DhApiConfigValue.java rename to api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java index 6229f8877..363077b1c 100644 --- a/api/src/main/java/com/seibel/lod/api/items/objects/config/DhApiConfigValue.java +++ b/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java @@ -1,9 +1,9 @@ -package com.seibel.lod.api.items.objects.config; +package com.seibel.lod.api.objects.config; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; import com.seibel.lod.core.interfaces.config.IConfigEntry; import com.seibel.lod.core.interfaces.config.IConverter; -import com.seibel.lod.core.interfaces.config.converters.DefaultConverter; +import com.seibel.lod.core.util.converters.DefaultConverter; /** * A wrapper used to interface with Distant Horizon's Config.

diff --git a/api/src/main/java/com/seibel/lod/api/items/objects/data/DhApiTerrainDataPoint.java b/api/src/main/java/com/seibel/lod/api/objects/data/DhApiTerrainDataPoint.java similarity index 92% rename from api/src/main/java/com/seibel/lod/api/items/objects/data/DhApiTerrainDataPoint.java rename to api/src/main/java/com/seibel/lod/api/objects/data/DhApiTerrainDataPoint.java index dfcec46f0..ba9a816ce 100644 --- a/api/src/main/java/com/seibel/lod/api/items/objects/data/DhApiTerrainDataPoint.java +++ b/api/src/main/java/com/seibel/lod/api/objects/data/DhApiTerrainDataPoint.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.items.objects.data; +package com.seibel.lod.api.objects.data; import java.awt.Color; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java b/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java index 16692e7ef..5efe4216f 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java +++ b/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.DependencyInjection; -import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; import com.seibel.lod.core.interfaces.dependencyInjection.IOverrideInjector; import com.seibel.lod.core.util.StringUtil; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java b/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java index 114d2afae..2a2e533b3 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java +++ b/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.DependencyInjection; -import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; import java.util.ArrayList; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java b/api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java index c9a87b6e1..040c42606 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java +++ b/api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.DependencyInjection; -import com.seibel.lod.api.items.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; import com.seibel.lod.core.util.StringUtil; diff --git a/api/src/main/java/com/seibel/lod/core/ModInfo.java b/api/src/main/java/com/seibel/lod/core/ModInfo.java index 153292c58..5d2f70273 100644 --- a/api/src/main/java/com/seibel/lod/core/ModInfo.java +++ b/api/src/main/java/com/seibel/lod/core/ModInfo.java @@ -21,11 +21,6 @@ package com.seibel.lod.core; /** * This file is similar to mcmod.info - *
- * If you are looking at this mod's source code and don't - * know where to start. - * Go to the api/lod package (folder) and take a look at the ClientApi.java file, - * Pretty much all of the mod stems from there. * * @author James Seibel * @author Ran diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java b/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java index 096a93584..88972abd1 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java +++ b/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.interfaces.dependencyInjection; -import com.seibel.lod.api.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; public interface IOverrideInjector { diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/config/converters/DefaultConverter.java b/api/src/main/java/com/seibel/lod/core/util/converters/DefaultConverter.java similarity index 88% rename from api/src/main/java/com/seibel/lod/core/interfaces/config/converters/DefaultConverter.java rename to api/src/main/java/com/seibel/lod/core/util/converters/DefaultConverter.java index 134954f74..0d939746d 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/config/converters/DefaultConverter.java +++ b/api/src/main/java/com/seibel/lod/core/util/converters/DefaultConverter.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.interfaces.config.converters; +package com.seibel.lod.core.util.converters; import com.seibel.lod.core.interfaces.config.IConverter; diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/config/converters/RenderModeEnabledConverter.java b/api/src/main/java/com/seibel/lod/core/util/converters/RenderModeEnabledConverter.java similarity index 82% rename from api/src/main/java/com/seibel/lod/core/interfaces/config/converters/RenderModeEnabledConverter.java rename to api/src/main/java/com/seibel/lod/core/util/converters/RenderModeEnabledConverter.java index e43d9ae0f..ccd040321 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/config/converters/RenderModeEnabledConverter.java +++ b/api/src/main/java/com/seibel/lod/core/util/converters/RenderModeEnabledConverter.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.interfaces.config.converters; +package com.seibel.lod.core.util.converters; -import com.seibel.lod.api.items.enums.rendering.ERendererMode; +import com.seibel.lod.api.enums.rendering.ERendererMode; import com.seibel.lod.core.interfaces.config.IConverter; /** diff --git a/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java b/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java index 5fa40927e..b88a58de4 100644 --- a/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java +++ b/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java @@ -19,7 +19,7 @@ package com.seibel.lod.core; -import com.seibel.lod.api.items.enums.rendering.EFogDrawMode; +import com.seibel.lod.api.enums.rendering.EFogDrawMode; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; /** diff --git a/core/src/main/java/com/seibel/lod/core/ReflectionHandler.java b/core/src/main/java/com/seibel/lod/core/ReflectionHandler.java index 362e44e44..0bd82931f 100644 --- a/core/src/main/java/com/seibel/lod/core/ReflectionHandler.java +++ b/core/src/main/java/com/seibel/lod/core/ReflectionHandler.java @@ -27,7 +27,7 @@ import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import org.apache.logging.log4j.Logger; -import com.seibel.lod.api.items.enums.rendering.EFogDrawMode; +import com.seibel.lod.api.enums.rendering.EFogDrawMode; /** * A singleton used to get variables from methods diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java index 0d7cb10a2..ed81a5a84 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java @@ -1,11 +1,11 @@ package com.seibel.lod.core.api.external.methods.config; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.api.items.interfaces.config.both.IDhApiWorldGenerationConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiBuffersConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiGraphicsConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiMultiplayerConfig; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiThreadingConfig; +import com.seibel.lod.api.interfaces.config.IDhApiConfig; +import com.seibel.lod.api.interfaces.config.both.IDhApiWorldGenerationConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiBuffersConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiGraphicsConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiMultiplayerConfig; +import com.seibel.lod.api.interfaces.config.client.IDhApiThreadingConfig; import com.seibel.lod.core.api.external.methods.config.both.DhApiWorldGenerationConfig; import com.seibel.lod.core.api.external.methods.config.client.DhApiBuffersConfig; import com.seibel.lod.core.api.external.methods.config.client.DhApiGraphicsConfig; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/both/DhApiWorldGenerationConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/both/DhApiWorldGenerationConfig.java index e20251c7e..29e1eade2 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/both/DhApiWorldGenerationConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/both/DhApiWorldGenerationConfig.java @@ -19,14 +19,14 @@ package com.seibel.lod.core.api.external.methods.config.both; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.both.IDhApiWorldGenerationConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.both.IDhApiWorldGenerationConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; import com.seibel.lod.core.config.Config.Client.WorldGenerator; -import com.seibel.lod.api.items.enums.config.EBlocksToAvoid; -import com.seibel.lod.api.items.enums.config.EDistanceGenerationMode; -import com.seibel.lod.api.items.enums.config.EGenerationPriority; -import com.seibel.lod.api.items.enums.config.ELightGenerationMode; +import com.seibel.lod.api.enums.config.EBlocksToAvoid; +import com.seibel.lod.api.enums.config.EDistanceGenerationMode; +import com.seibel.lod.api.enums.config.EGenerationPriority; +import com.seibel.lod.api.enums.config.ELightGenerationMode; /** * Distant Horizons' world generation configuration.

diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiBuffersConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiBuffersConfig.java index 68e1fa177..46d5501a4 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiBuffersConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiBuffersConfig.java @@ -19,11 +19,11 @@ package com.seibel.lod.core.api.external.methods.config.client; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiBuffersConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.client.IDhApiBuffersConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; import com.seibel.lod.core.config.Config.Client.Advanced.Buffers; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; /** * Distant Horizons' OpenGL buffer configuration. diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiDebuggingConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiDebuggingConfig.java index e775bf2bf..c6aba94c4 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiDebuggingConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiDebuggingConfig.java @@ -19,11 +19,11 @@ package com.seibel.lod.core.api.external.methods.config.client; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiDebuggingConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.client.IDhApiDebuggingConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; -import com.seibel.lod.api.items.enums.rendering.EDebugMode; +import com.seibel.lod.api.enums.rendering.EDebugMode; /** * Distant Horizons' debug configuration. diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java index ad021d7a3..a88e3bb02 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java @@ -19,13 +19,13 @@ package com.seibel.lod.core.api.external.methods.config.client; -import com.seibel.lod.api.items.enums.config.*; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiGraphicsConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; -import com.seibel.lod.core.interfaces.config.converters.RenderModeEnabledConverter; +import com.seibel.lod.api.enums.config.*; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.client.IDhApiGraphicsConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; +import com.seibel.lod.core.util.converters.RenderModeEnabledConverter; import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.items.enums.rendering.ERendererMode; +import com.seibel.lod.api.enums.rendering.ERendererMode; import com.seibel.lod.core.config.Config.Client.Graphics.Quality; import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; import com.seibel.lod.core.config.Config.Client.Graphics.AdvancedGraphics; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsFogConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsFogConfig.java index 28b95fe5a..98190a8c6 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsFogConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsFogConfig.java @@ -19,10 +19,10 @@ package com.seibel.lod.core.api.external.methods.config.client; -import com.seibel.lod.api.items.enums.rendering.*; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiGraphicsFogConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; +import com.seibel.lod.api.enums.rendering.*; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.client.IDhApiGraphicsFogConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; import com.seibel.lod.core.config.Config.Client.Graphics.FogQuality; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiplayerConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiplayerConfig.java index 9409fd1b3..0f6765810 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiplayerConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiplayerConfig.java @@ -19,11 +19,11 @@ package com.seibel.lod.core.api.external.methods.config.client; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiMultiplayerConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.client.IDhApiMultiplayerConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; import com.seibel.lod.core.config.Config.Client.Multiplayer; -import com.seibel.lod.api.items.enums.config.EServerFolderNameMode; +import com.seibel.lod.api.enums.config.EServerFolderNameMode; /** * Distant Horizons' client-side multiplayer configuration. diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiThreadingConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiThreadingConfig.java index 2d4613b15..e35ab8952 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiThreadingConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiThreadingConfig.java @@ -19,9 +19,9 @@ package com.seibel.lod.core.api.external.methods.config.client; -import com.seibel.lod.api.items.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.items.interfaces.config.client.IDhApiThreadingConfig; -import com.seibel.lod.api.items.objects.config.DhApiConfigValue; +import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.lod.api.interfaces.config.client.IDhApiThreadingConfig; +import com.seibel.lod.api.objects.config.DhApiConfigValue; import com.seibel.lod.core.config.Config.Client.Advanced.Threading; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java index 36497f974..2ec918e0f 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java @@ -25,8 +25,8 @@ import com.seibel.lod.core.DependencyInjection.DhApiEventInjector; import com.seibel.lod.core.level.IClientLevel; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.api.items.enums.rendering.EDebugMode; -import com.seibel.lod.api.items.enums.rendering.ERendererMode; +import com.seibel.lod.api.enums.rendering.EDebugMode; +import com.seibel.lod.api.enums.rendering.ERendererMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.level.ILevel; import com.seibel.lod.core.logging.ConfigBasedLogger; diff --git a/core/src/main/java/com/seibel/lod/core/config/Config.java b/core/src/main/java/com/seibel/lod/core/config/Config.java index 462d07325..ecfdcf69e 100644 --- a/core/src/main/java/com/seibel/lod/core/config/Config.java +++ b/core/src/main/java/com/seibel/lod/core/config/Config.java @@ -20,8 +20,8 @@ package com.seibel.lod.core.config; -import com.seibel.lod.api.items.enums.config.*; -import com.seibel.lod.api.items.enums.rendering.*; +import com.seibel.lod.api.enums.config.*; +import com.seibel.lod.api.enums.rendering.*; import com.seibel.lod.core.config.types.*; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java b/core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java index ce317449e..14ead7bf9 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java +++ b/core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.config.gui; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; import com.seibel.lod.core.render.glObject.GLProxy; import com.seibel.lod.core.render.glObject.GLState; import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java index 10ddfe7ec..a7813d2f0 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java @@ -9,9 +9,9 @@ import com.seibel.lod.core.util.objects.UncheckedInterruptedException; import com.seibel.lod.core.render.RenderBuffer; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.items.enums.rendering.EDebugMode; -import com.seibel.lod.api.items.enums.rendering.EGLProxyContext; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.rendering.EDebugMode; +import com.seibel.lod.api.enums.rendering.EGLProxyContext; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.pos.DhBlockPos; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java index 062b2bbe2..b1246799c 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java @@ -20,7 +20,7 @@ package com.seibel.lod.core.datatype.column.render; import com.seibel.lod.core.datatype.column.accessor.ColumnFormat; -import com.seibel.lod.api.items.enums.rendering.EDebugMode; +import com.seibel.lod.api.enums.rendering.EDebugMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.datatype.column.accessor.ColumnArrayView; import com.seibel.lod.core.util.ColorUtil; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java index 0be3c05f7..522cc3052 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/LodQuadBuilder.java @@ -29,7 +29,7 @@ import java.util.Objects; import com.seibel.lod.core.render.RenderBuffer; import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.enums.ELodDirection.Axis; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; import com.seibel.lod.core.util.ColorUtil; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/transform/LodBuilderConfig.java b/core/src/main/java/com/seibel/lod/core/datatype/transform/LodBuilderConfig.java index 471ffe0fd..b7876bcb8 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/transform/LodBuilderConfig.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/transform/LodBuilderConfig.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.datatype.transform; -import com.seibel.lod.api.items.enums.config.EDistanceGenerationMode; +import com.seibel.lod.api.enums.config.EDistanceGenerationMode; /** * This is used to easily configure how LodChunks are generated. diff --git a/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java b/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java index c0e1fb1f6..282204bbf 100644 --- a/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java +++ b/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java @@ -2,7 +2,7 @@ package com.seibel.lod.core.file.structure; import com.seibel.lod.core.file.LevelToFileMatcher; import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.items.enums.config.EServerFolderNameMode; +import com.seibel.lod.api.enums.config.EServerFolderNameMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.util.objects.ParsedIp; import com.seibel.lod.core.util.LodUtil; diff --git a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java index 6dd73e329..0b1eb8061 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java +++ b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java @@ -21,7 +21,7 @@ package com.seibel.lod.core.generation; import com.seibel.lod.core.level.ILevel; import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.items.enums.config.EDistanceGenerationMode; +import com.seibel.lod.api.enums.config.EDistanceGenerationMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.pos.DhChunkPos; diff --git a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java b/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java index 8e5503667..90af51168 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java +++ b/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.logging; -import com.seibel.lod.api.items.enums.config.ELoggerMode; +import com.seibel.lod.api.enums.config.ELoggerMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import org.apache.logging.log4j.Level; diff --git a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java b/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java index 5fa9da5a7..3dcf748ca 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java +++ b/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.logging; -import com.seibel.lod.api.items.enums.config.ELoggerMode; +import com.seibel.lod.api.enums.config.ELoggerMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import org.apache.logging.log4j.Level; diff --git a/core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java b/core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java index 8b2e48ba5..9f4f13c9f 100644 --- a/core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java +++ b/core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.render.fog; -import com.seibel.lod.api.items.enums.rendering.EFogFalloff; +import com.seibel.lod.api.enums.rendering.EFogFalloff; import java.util.Objects; diff --git a/core/src/main/java/com/seibel/lod/core/render/fog/LodFogConfig.java b/core/src/main/java/com/seibel/lod/core/render/fog/LodFogConfig.java index 1c44d66b3..79cd121f2 100644 --- a/core/src/main/java/com/seibel/lod/core/render/fog/LodFogConfig.java +++ b/core/src/main/java/com/seibel/lod/core/render/fog/LodFogConfig.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.render.fog; -import com.seibel.lod.api.items.enums.rendering.*; +import com.seibel.lod.api.enums.rendering.*; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.IReflectionHandler; import com.seibel.lod.core.dependencyInjection.SingletonInjector; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java b/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java index cebe326dc..206f084d6 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java @@ -40,8 +40,8 @@ import org.lwjgl.opengl.GLUtil; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.items.enums.rendering.EGLProxyContext; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.rendering.EGLProxyContext; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.util.objects.GLMessage; import com.seibel.lod.core.util.objects.GLMessageOutputStream; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java b/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java index 0d45c4b84..a57b214b6 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.render.glObject.buffer; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.items.enums.rendering.EGLProxyContext; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.rendering.EGLProxyContext; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.render.glObject.GLProxy; import com.seibel.lod.core.util.LodUtil; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java b/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java index ee594d470..c913ca4a6 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java @@ -23,7 +23,7 @@ import java.nio.ByteBuffer; import org.lwjgl.opengl.GL32; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; /** * This is a container for a OpenGL diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/QuadElementBuffer.java b/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/QuadElementBuffer.java index 9c25484bb..5448ad99c 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/QuadElementBuffer.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/QuadElementBuffer.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.render.glObject.buffer; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.render.glObject.GLProxy; import com.seibel.lod.core.render.glObject.GLEnums; diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java b/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java index 4d3322faa..1f5e595b9 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java +++ b/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java @@ -22,8 +22,8 @@ package com.seibel.lod.core.render.renderer; import com.seibel.lod.core.level.IClientLevel; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.config.types.ConfigEntry; -import com.seibel.lod.api.items.enums.rendering.EDebugMode; -import com.seibel.lod.api.items.enums.rendering.EFogColorMode; +import com.seibel.lod.api.enums.rendering.EDebugMode; +import com.seibel.lod.api.enums.rendering.EFogColorMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.ConfigBasedSpamLogger; diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java b/core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java index eb1f9e3d9..fdb6fe5f3 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java +++ b/core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.render.renderer; -import com.seibel.lod.api.items.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.items.enums.config.ELoggerMode; +import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.lod.api.enums.config.ELoggerMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.ConfigBasedLogger; diff --git a/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java b/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java index 576b110cb..efa8e0214 100644 --- a/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java @@ -20,7 +20,7 @@ package com.seibel.lod.core.util; import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.items.enums.config.EHorizontalQuality; +import com.seibel.lod.api.enums.config.EHorizontalQuality; /** * diff --git a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java b/core/src/main/java/com/seibel/lod/core/util/LodUtil.java index f1475268c..1733e23d7 100644 --- a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/LodUtil.java @@ -24,8 +24,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.items.enums.config.EServerFolderNameMode; -import com.seibel.lod.api.items.enums.config.EVanillaOverdraw; +import com.seibel.lod.api.enums.config.EServerFolderNameMode; +import com.seibel.lod.api.enums.config.EVanillaOverdraw; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.pos.DhChunkPos; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java index 8478dc2d9..39c9d4a71 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.wrapperInterfaces.config; -import com.seibel.lod.api.items.enums.config.*; -import com.seibel.lod.api.items.enums.rendering.*; +import com.seibel.lod.api.enums.config.*; +import com.seibel.lod.api.enums.rendering.*; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; import com.seibel.lod.core.dependencyInjection.SingletonInjector; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java index d139ff7cd..bf2325641 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.wrapperInterfaces.config; -import com.seibel.lod.api.items.enums.config.*; -import com.seibel.lod.api.items.enums.rendering.*; +import com.seibel.lod.api.enums.config.*; +import com.seibel.lod.api.enums.rendering.*; import com.seibel.lod.core.config.Config; /** diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java index 88d613ea9..9f5515d57 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.wrapperInterfaces.world; -import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; /** diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java index 2f58adff6..f815d823a 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.wrapperInterfaces.world; -import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; import com.seibel.lod.core.pos.DhBlockPos; import com.seibel.lod.core.pos.DhChunkPos; diff --git a/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java b/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java index abb54b4c5..5a469a9b0 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.api.items.interfaces.override.IDhApiOverrideable; +import com.seibel.lod.api.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 836f6e1d8..4418235cd 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.api.items.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.api.items.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.api.items.interfaces.world.IDhApiLevelWrapper; +import com.seibel.lod.api.enums.worldGeneration.EDhApiLevelType; +import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.lod.api.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 1043cd4be..4415b9377 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java @@ -1,10 +1,10 @@ package testItems.worldGeneratorInjection.objects; -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.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.DependencyInjection.OverrideInjector; /** diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java index 582fdb95f..1806fc54e 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java @@ -1,10 +1,10 @@ package testItems.worldGeneratorInjection.objects; -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.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.DependencyInjection.OverrideInjector; /** diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java index 81886f2b7..e15c42415 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java @@ -1,10 +1,10 @@ package testItems.worldGeneratorInjection.objects; -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.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.DependencyInjection.OverrideInjector; /** diff --git a/core/src/test/java/tests/DependencyInjectorTest.java b/core/src/test/java/tests/DependencyInjectorTest.java index 7f44fc9b0..85661d915 100644 --- a/core/src/test/java/tests/DependencyInjectorTest.java +++ b/core/src/test/java/tests/DependencyInjectorTest.java @@ -1,8 +1,8 @@ package tests; -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.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.lod.core.DependencyInjection.DependencyInjector; import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; import com.seibel.lod.core.DependencyInjection.OverrideInjector;