From 6629ec9dc08a5757261baeca8ba926175bf44a14 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 11 Jul 2022 21:31:33 -0500 Subject: [PATCH] Set up the API packages for data and overriding data - getting/setting terrain data overriding - overriding DH systems --- .../seibel/lod/core/api/external/ExternalApiShared.java | 6 ------ src/main/java/com/seibel/lod/core/api/external/Readme.md | 1 + .../lod/core/api/external/config/DhApiWorldGeneration.java | 6 ++++-- .../java/com/seibel/lod/core/api/external/config/Readme.md | 1 + .../lod/core/api/external/config/client/DhApiBuffers.java | 6 ++---- .../core/api/external/config/client/DhApiDebugging.java | 4 ++-- .../lod/core/api/external/config/client/DhApiGraphics.java | 5 +++-- .../core/api/external/config/client/DhApiGraphicsFog.java | 5 +++-- .../core/api/external/config/client/DhApiMultiplayer.java | 4 ++-- .../core/api/external/config/client/DhApiThreading.java | 2 +- .../objects}/enums/DhApiEnumAssembly.java | 2 +- .../objects}/enums/EDhApiBlocksToAvoid.java | 2 +- .../objects}/enums/EDhApiBufferRebuildTimes.java | 2 +- .../objects}/enums/EDhApiDebugMode.java | 2 +- .../objects}/enums/EDhApiDistanceGenerationMode.java | 2 +- .../objects}/enums/EDhApiDropoffQuality.java | 2 +- .../objects}/enums/EDhApiFogColorMode.java | 2 +- .../objects}/enums/EDhApiFogDistance.java | 2 +- .../objects}/enums/EDhApiFogDrawMode.java | 2 +- .../objects}/enums/EDhApiFogFalloff.java | 2 +- .../objects}/enums/EDhApiGenerationPriority.java | 2 +- .../objects}/enums/EDhApiGpuUploadMethod.java | 2 +- .../objects}/enums/EDhApiHeightFogMixMode.java | 2 +- .../objects}/enums/EDhApiHeightFogMode.java | 2 +- .../objects}/enums/EDhApiHorizontalQuality.java | 2 +- .../objects}/enums/EDhApiHorizontalResolution.java | 7 +------ .../objects}/enums/EDhApiLightGenerationMode.java | 2 +- .../objects}/enums/EDhApiRendererMode.java | 2 +- .../objects}/enums/EDhApiServerFolderNameMode.java | 2 +- .../objects}/enums/EDhApiVanillaOverdraw.java | 2 +- .../objects}/enums/EDhApiVerticalQuality.java | 2 +- .../objects}/wrapperInterfaces/IDhApiConfig.java | 2 +- .../java/com/seibel/lod/core/api/external/data/Readme.md | 1 + .../com/seibel/lod/core/api/external/override/Readme.md | 1 + .../lod/core/api/implementation/wrappers/DhApiConfig.java | 2 +- src/test/java/ApiEnumSyncTests.java | 2 +- 36 files changed, 45 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/seibel/lod/core/api/external/Readme.md create mode 100644 src/main/java/com/seibel/lod/core/api/external/config/Readme.md rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/DhApiEnumAssembly.java (94%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiBlocksToAvoid.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiBufferRebuildTimes.java (94%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiDebugMode.java (96%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiDistanceGenerationMode.java (97%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiDropoffQuality.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiFogColorMode.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiFogDistance.java (94%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiFogDrawMode.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiFogFalloff.java (83%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiGenerationPriority.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiGpuUploadMethod.java (96%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiHeightFogMixMode.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiHeightFogMode.java (96%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiHorizontalQuality.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiHorizontalResolution.java (88%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiLightGenerationMode.java (94%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiRendererMode.java (94%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiServerFolderNameMode.java (96%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiVanillaOverdraw.java (95%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/enums/EDhApiVerticalQuality.java (94%) rename src/main/java/com/seibel/lod/core/api/external/{apiObjects => config/objects}/wrapperInterfaces/IDhApiConfig.java (94%) create mode 100644 src/main/java/com/seibel/lod/core/api/external/data/Readme.md create mode 100644 src/main/java/com/seibel/lod/core/api/external/override/Readme.md diff --git a/src/main/java/com/seibel/lod/core/api/external/ExternalApiShared.java b/src/main/java/com/seibel/lod/core/api/external/ExternalApiShared.java index ec6c5aaf8..87ef25101 100644 --- a/src/main/java/com/seibel/lod/core/api/external/ExternalApiShared.java +++ b/src/main/java/com/seibel/lod/core/api/external/ExternalApiShared.java @@ -4,12 +4,6 @@ package com.seibel.lod.core.api.external; * This stores objects and variables that * are shared between the different external api classes.

* - * The external api package is designed to hold any code that - * interfaces between Distant Horizons and other mods or projects.
- * For example: if a weather mod wanted to disable LOD rendering during a blizzard - * they would do that through a method in the external api. - * - * * @author James Seibel * @version 2022-6-2 */ diff --git a/src/main/java/com/seibel/lod/core/api/external/Readme.md b/src/main/java/com/seibel/lod/core/api/external/Readme.md new file mode 100644 index 000000000..7d9cf4a6a --- /dev/null +++ b/src/main/java/com/seibel/lod/core/api/external/Readme.md @@ -0,0 +1 @@ +The external api package holds any code that interfaces between Distant Horizons and other mods or projects. \ No newline at end of file diff --git a/src/main/java/com/seibel/lod/core/api/external/config/DhApiWorldGeneration.java b/src/main/java/com/seibel/lod/core/api/external/config/DhApiWorldGeneration.java index 6c5f05eb9..c215bfe7c 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/DhApiWorldGeneration.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/DhApiWorldGeneration.java @@ -19,8 +19,10 @@ package com.seibel.lod.core.api.external.config; -import com.seibel.lod.core.api.external.apiObjects.enums.*; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.enums.EDhApiDistanceGenerationMode; +import com.seibel.lod.core.api.external.config.objects.enums.EDhApiBlocksToAvoid; +import com.seibel.lod.core.api.external.config.objects.enums.EDhApiLightGenerationMode; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.WorldGenerator; diff --git a/src/main/java/com/seibel/lod/core/api/external/config/Readme.md b/src/main/java/com/seibel/lod/core/api/external/config/Readme.md new file mode 100644 index 000000000..0e6ef71ea --- /dev/null +++ b/src/main/java/com/seibel/lod/core/api/external/config/Readme.md @@ -0,0 +1 @@ +The config api package holds objects and methods for getting/setting Distant Horizons' config values. \ No newline at end of file diff --git a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiBuffers.java b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiBuffers.java index 5c627077b..1a4052130 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiBuffers.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiBuffers.java @@ -19,13 +19,11 @@ package com.seibel.lod.core.api.external.config.client; -import com.seibel.lod.core.api.external.apiObjects.enums.EDhApiBufferRebuildTimes; -import com.seibel.lod.core.api.external.apiObjects.enums.EDhApiGpuUploadMethod; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.enums.EDhApiGpuUploadMethod; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Buffers; -import com.seibel.lod.core.enums.config.EBufferRebuildTimes; import com.seibel.lod.core.enums.config.EGpuUploadMethod; /** diff --git a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiDebugging.java b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiDebugging.java index 04f45b72a..b0b45c66d 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiDebugging.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiDebugging.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.api.external.config.client; -import com.seibel.lod.core.api.external.apiObjects.enums.EDhApiDebugMode; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.enums.EDhApiDebugMode; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; diff --git a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphics.java b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphics.java index f7235d751..2733bae9b 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphics.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphics.java @@ -19,8 +19,9 @@ package com.seibel.lod.core.api.external.config.client; -import com.seibel.lod.core.api.external.apiObjects.enums.*; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.enums.*; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.methods.config.objects.enums.*; 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; diff --git a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphicsFog.java b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphicsFog.java index c99cae591..ce8b75f6e 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphicsFog.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiGraphicsFog.java @@ -19,8 +19,9 @@ package com.seibel.lod.core.api.external.config.client; -import com.seibel.lod.core.api.external.apiObjects.enums.*; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.enums.*; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.methods.config.objects.enums.*; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.enums.rendering.*; diff --git a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiMultiplayer.java b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiMultiplayer.java index d4f216485..122fdb614 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiMultiplayer.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiMultiplayer.java @@ -19,8 +19,8 @@ package com.seibel.lod.core.api.external.config.client; -import com.seibel.lod.core.api.external.apiObjects.enums.EDhApiServerFolderNameMode; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.enums.EDhApiServerFolderNameMode; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; import com.seibel.lod.core.api.implementation.objects.GenericEnumConverter; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Multiplayer; diff --git a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiThreading.java b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiThreading.java index ea0117889..eddb53c29 100644 --- a/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiThreading.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/client/DhApiThreading.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.api.external.config.client; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; import com.seibel.lod.core.api.implementation.wrappers.DhApiConfig; import com.seibel.lod.core.config.Config.Client.Advanced.Threading; diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/DhApiEnumAssembly.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/DhApiEnumAssembly.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/DhApiEnumAssembly.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/DhApiEnumAssembly.java index 1cd15e302..4bb959171 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/DhApiEnumAssembly.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/DhApiEnumAssembly.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * Assembly classes are used to reference the package they are in. diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiBlocksToAvoid.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiBlocksToAvoid.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiBlocksToAvoid.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiBlocksToAvoid.java index 32bad1d8f..8304d6473 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiBlocksToAvoid.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiBlocksToAvoid.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * NONE,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiBufferRebuildTimes.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiBufferRebuildTimes.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiBufferRebuildTimes.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiBufferRebuildTimes.java index e263d655c..5bba47210 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiBufferRebuildTimes.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiBufferRebuildTimes.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * CONSTANT
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDebugMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDebugMode.java similarity index 96% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDebugMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDebugMode.java index c437a5a7b..554064433 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDebugMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDebugMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * OFF,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDistanceGenerationMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDistanceGenerationMode.java similarity index 97% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDistanceGenerationMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDistanceGenerationMode.java index 82912769b..349f68c92 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDistanceGenerationMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDistanceGenerationMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * NONE
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDropoffQuality.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDropoffQuality.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDropoffQuality.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDropoffQuality.java index c3447a0a2..345909b43 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiDropoffQuality.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiDropoffQuality.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * AUTO
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogColorMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogColorMode.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogColorMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogColorMode.java index 9cf31049b..54177d937 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogColorMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogColorMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * USE_DEFAULT_FOG_COLOR,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogDistance.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogDistance.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogDistance.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogDistance.java index 05be7c5ef..ac44c4836 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogDistance.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogDistance.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * NEAR,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogDrawMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogDrawMode.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogDrawMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogDrawMode.java index c317f27bd..97c49aff5 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogDrawMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogDrawMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * USE_OPTIFINE_FOG_SETTING,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogFalloff.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogFalloff.java similarity index 83% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogFalloff.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogFalloff.java index ba7c7d696..c5826bf1d 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiFogFalloff.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiFogFalloff.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * LINEAR,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiGenerationPriority.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiGenerationPriority.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiGenerationPriority.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiGenerationPriority.java index 8892a07e7..cc011b307 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiGenerationPriority.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiGenerationPriority.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * AUTO
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiGpuUploadMethod.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiGpuUploadMethod.java similarity index 96% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiGpuUploadMethod.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiGpuUploadMethod.java index 33d5d0245..24b12d540 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiGpuUploadMethod.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiGpuUploadMethod.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * AUTO,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHeightFogMixMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHeightFogMixMode.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHeightFogMixMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHeightFogMixMode.java index ed0a2a36a..e3b63b5fe 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHeightFogMixMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHeightFogMixMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * BASIC
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHeightFogMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHeightFogMode.java similarity index 96% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHeightFogMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHeightFogMode.java index 6b7f5a25f..26d70aa4c 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHeightFogMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHeightFogMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * ABOVE_CAMERA,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHorizontalQuality.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHorizontalQuality.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHorizontalQuality.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHorizontalQuality.java index 3b12789a6..87997d077 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHorizontalQuality.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHorizontalQuality.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * LOWEST
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHorizontalResolution.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHorizontalResolution.java similarity index 88% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHorizontalResolution.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHorizontalResolution.java index 27584f438..2f9dd1ed4 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiHorizontalResolution.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiHorizontalResolution.java @@ -17,12 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; - -import com.seibel.lod.core.util.LodUtil; - -import java.util.ArrayList; -import java.util.Collections; +package com.seibel.lod.core.api.external.config.objects.enums; /** * BLOCK
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiLightGenerationMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiLightGenerationMode.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiLightGenerationMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiLightGenerationMode.java index f20308ca1..1a61ed881 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiLightGenerationMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiLightGenerationMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * FAST,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiRendererMode.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiRendererMode.java index 6e284eb46..ed2d71a3c 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiRendererMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * DEFAULT,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiServerFolderNameMode.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiServerFolderNameMode.java similarity index 96% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiServerFolderNameMode.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiServerFolderNameMode.java index 5b99c1cdf..70b2e93ac 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiServerFolderNameMode.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiServerFolderNameMode.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * AUTO,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiVanillaOverdraw.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiVanillaOverdraw.java similarity index 95% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiVanillaOverdraw.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiVanillaOverdraw.java index 5515ccd98..33ea3481f 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiVanillaOverdraw.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiVanillaOverdraw.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * NEVER,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiVerticalQuality.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiVerticalQuality.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiVerticalQuality.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiVerticalQuality.java index 7bc00eda0..cb1b85dac 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiVerticalQuality.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/enums/EDhApiVerticalQuality.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.apiObjects.enums; +package com.seibel.lod.core.api.external.config.objects.enums; /** * LOW,
diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/wrapperInterfaces/IDhApiConfig.java b/src/main/java/com/seibel/lod/core/api/external/config/objects/wrapperInterfaces/IDhApiConfig.java similarity index 94% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/wrapperInterfaces/IDhApiConfig.java rename to src/main/java/com/seibel/lod/core/api/external/config/objects/wrapperInterfaces/IDhApiConfig.java index b21406c44..5bc63f370 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/wrapperInterfaces/IDhApiConfig.java +++ b/src/main/java/com/seibel/lod/core/api/external/config/objects/wrapperInterfaces/IDhApiConfig.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces; +package com.seibel.lod.core.api.external.config.objects.wrapperInterfaces; /** * An interface for Distant Horizon's Config. diff --git a/src/main/java/com/seibel/lod/core/api/external/data/Readme.md b/src/main/java/com/seibel/lod/core/api/external/data/Readme.md new file mode 100644 index 000000000..67c583540 --- /dev/null +++ b/src/main/java/com/seibel/lod/core/api/external/data/Readme.md @@ -0,0 +1 @@ +The data api package holds objects and methods for getting/setting terrain data stored by Distant Horizons. \ No newline at end of file diff --git a/src/main/java/com/seibel/lod/core/api/external/override/Readme.md b/src/main/java/com/seibel/lod/core/api/external/override/Readme.md new file mode 100644 index 000000000..e15e3e6a0 --- /dev/null +++ b/src/main/java/com/seibel/lod/core/api/external/override/Readme.md @@ -0,0 +1 @@ +The overide api package holds objects and methods for overriding Distant Horizons' backend systems, so they can be replaced and improved. \ No newline at end of file diff --git a/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java b/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java index d6d279330..070043018 100644 --- a/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java +++ b/src/main/java/com/seibel/lod/core/api/implementation/wrappers/DhApiConfig.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.implementation.wrappers; -import com.seibel.lod.core.api.external.apiObjects.wrapperInterfaces.IDhApiConfig; +import com.seibel.lod.core.api.external.config.objects.wrapperInterfaces.IDhApiConfig; import com.seibel.lod.core.api.implementation.interfaces.IConverter; import com.seibel.lod.core.api.implementation.objects.DefaultConverter; import com.seibel.lod.core.config.types.ConfigEntry; diff --git a/src/test/java/ApiEnumSyncTests.java b/src/test/java/ApiEnumSyncTests.java index 14b2a49b5..7323dd891 100644 --- a/src/test/java/ApiEnumSyncTests.java +++ b/src/test/java/ApiEnumSyncTests.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import com.seibel.lod.core.api.external.apiObjects.enums.DhApiEnumAssembly; +import com.seibel.lod.core.api.external.config.objects.enums.DhApiEnumAssembly; import com.seibel.lod.core.enums.rendering.EFogDrawMode; import com.seibel.lod.core.enums.CoreEnumAssembly; import com.seibel.lod.core.enums.config.EVerticalQuality;