diff --git a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java b/api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java rename to api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java index bddd0f5ef..1ee361e9f 100644 --- a/core/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/DhApiConfig.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.implementation.wrappers; +package com.seibel.lod.api.methods.config; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.interfaces.config.IConverter; diff --git a/api/src/main/java/com/seibel/lod/api/config/Readme.md b/api/src/main/java/com/seibel/lod/api/methods/config/Readme.md similarity index 100% rename from api/src/main/java/com/seibel/lod/api/config/Readme.md rename to api/src/main/java/com/seibel/lod/api/methods/config/Readme.md diff --git a/api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java b/api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java rename to api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java index 43d8c0b4c..adabf6706 100644 --- a/api/src/main/java/com/seibel/lod/api/config/both/DhApiWorldGeneration.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/both/DhApiWorldGeneration.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.both; +package com.seibel.lod.api.methods.config.both; import com.seibel.lod.api.items.enums.config.EDhApiDistanceGenerationMode; import com.seibel.lod.api.items.enums.config.EDhApiBlocksToAvoid; import com.seibel.lod.api.items.enums.config.EDhApiLightGenerationMode; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.WorldGenerator; import com.seibel.lod.core.enums.config.EBlocksToAvoid; import com.seibel.lod.core.enums.config.EDistanceGenerationMode; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java similarity index 94% rename from api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java rename to api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java index 7b2bb5b8f..412a1a365 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiBuffers.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiBuffers.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.client; +package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.EDhApiGpuUploadMethod; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Buffers; import com.seibel.lod.core.enums.config.EGpuUploadMethod; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java similarity index 94% rename from api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java rename to api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java index 3a338707a..715f92bd3 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiDebugging.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiDebugging.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.client; +package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.EDhApiDebugMode; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; import com.seibel.lod.core.enums.rendering.EDebugMode; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java similarity index 98% rename from api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java rename to api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java index 99ef76767..990ba4c0e 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphics.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphics.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.client; +package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.*; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.objects.RenderModeEnabledConverter; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.config.*; import com.seibel.lod.core.enums.rendering.ERendererMode; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java similarity index 98% rename from api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java rename to api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java index e7e578d1a..29e4da106 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiGraphicsFog.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiGraphicsFog.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.client; +package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.*; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.enums.rendering.*; import com.seibel.lod.core.config.Config.Client.Graphics.FogQuality; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java rename to api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java index 4ae9770ee..4e6ae2f81 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiMultiplayer.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiMultiplayer.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.client; +package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.enums.config.EDhApiServerFolderNameMode; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Multiplayer; import com.seibel.lod.core.enums.config.EServerFolderNameMode; diff --git a/api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiThreading.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java rename to api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiThreading.java index 5fd83fd25..dea0b8349 100644 --- a/api/src/main/java/com/seibel/lod/api/config/client/DhApiThreading.java +++ b/api/src/main/java/com/seibel/lod/api/methods/config/client/DhApiThreading.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.config.client; +package com.seibel.lod.api.methods.config.client; import com.seibel.lod.api.items.interfaces.config.IDhApiConfig; -import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; +import com.seibel.lod.api.methods.config.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Threading; /** diff --git a/core/src/main/java/com/seibel/lod/core/enums/CoreEnumAssembly.java b/core/src/main/java/com/seibel/lod/core/enums/CoreEnumAssembly.java index 3ffeb241c..ddac9819b 100644 --- a/core/src/main/java/com/seibel/lod/core/enums/CoreEnumAssembly.java +++ b/core/src/main/java/com/seibel/lod/core/enums/CoreEnumAssembly.java @@ -20,7 +20,6 @@ package com.seibel.lod.core.enums; import com.seibel.lod.core.enums.config.CoreConfigEnumAssembly; -import com.seibel.lod.core.enums.override.CoreOverrideEnumAssembly; import com.seibel.lod.core.enums.rendering.CoreRenderingEnumAssembly; import com.seibel.lod.core.enums.worldGeneration.CoreWorldGenerationEnumAssembly; @@ -28,7 +27,7 @@ import com.seibel.lod.core.enums.worldGeneration.CoreWorldGenerationEnumAssembly * Assembly classes are used to reference the package they are in. * * @author James Seibel - * @version 2022-7-25 + * @version 2022-9-6 */ public class CoreEnumAssembly { @@ -36,7 +35,6 @@ public class CoreEnumAssembly // This is done so they can be found via reflection. private static final CoreRenderingEnumAssembly renderingAssembly = new CoreRenderingEnumAssembly(); private static final CoreConfigEnumAssembly configAssembly = new CoreConfigEnumAssembly(); - private static final CoreOverrideEnumAssembly overrideAssembly = new CoreOverrideEnumAssembly(); private static final CoreWorldGenerationEnumAssembly worldGenAssembly = new CoreWorldGenerationEnumAssembly(); /** All enums should have this prefix */