diff --git a/_Misc Files/IDE files/minecraft launch options.txt b/_Misc Files/IDE files/minecraft launch options.txt index 66ad16049..b22d7a44d 100644 Binary files a/_Misc Files/IDE files/minecraft launch options.txt and b/_Misc Files/IDE files/minecraft launch options.txt differ diff --git a/api/src/main/java/com/seibel/lod/api/DhApi.java b/api/src/main/java/com/seibel/distanthorizons/api/DhApi.java similarity index 74% rename from api/src/main/java/com/seibel/lod/api/DhApi.java rename to api/src/main/java/com/seibel/distanthorizons/api/DhApi.java index f966d0f86..e3d855a40 100644 --- a/api/src/main/java/com/seibel/lod/api/DhApi.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/DhApi.java @@ -1,17 +1,18 @@ -package com.seibel.lod.api; +package com.seibel.distanthorizons.api; -import com.seibel.lod.api.interfaces.config.IDhApiConfig; -import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGeneratorOverrideRegister; -import com.seibel.lod.api.interfaces.render.IDhApiRenderProxy; -import com.seibel.lod.api.interfaces.world.IDhApiWorldProxy; -import com.seibel.lod.api.methods.override.DhApiWorldGeneratorOverrideRegister; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.api.interfaces.data.IDhApiTerrainDataRepo; -import com.seibel.lod.api.interfaces.events.IDhApiEventInjector; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector; +import com.seibel.distanthorizons.api.interfaces.events.IDhApiEventInjector; +import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGeneratorOverrideRegister; +import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.distanthorizons.api.methods.override.DhApiWorldGeneratorOverrideRegister; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfig; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiWorldProxy; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.api.interfaces.data.IDhApiTerrainDataRepo; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IOverrideInjector; /** * This is the masthead of the API, almost everything you could want to do @@ -34,7 +35,7 @@ public class DhApi * WARNING: * All objects in this class will be null until after DH initializes for the first time.

* - * Bind a custom {@link com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent DhApiAfterDhInitEvent} + * Bind a custom {@link DhApiAfterDhInitEvent DhApiAfterDhInitEvent} * to {@link DhApi#events ApiCoreInjectors.events} in order to be notified when this class can * be safely used. */ diff --git a/api/src/main/java/com/seibel/lod/api/Readme.md b/api/src/main/java/com/seibel/distanthorizons/api/Readme.md similarity index 100% rename from api/src/main/java/com/seibel/lod/api/Readme.md rename to api/src/main/java/com/seibel/distanthorizons/api/Readme.md diff --git a/api/src/main/java/com/seibel/lod/api/enums/EDhApiDetailLevel.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/EDhApiDetailLevel.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/EDhApiDetailLevel.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/EDhApiDetailLevel.java index fe7daa764..329926800 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/EDhApiDetailLevel.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/EDhApiDetailLevel.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.enums; +package com.seibel.distanthorizons.api.enums; /** * BLOCK - Detail Level: 0, width 1 block,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/DisallowSelectingViaConfigGui.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/DisallowSelectingViaConfigGui.java similarity index 88% rename from api/src/main/java/com/seibel/lod/api/enums/config/DisallowSelectingViaConfigGui.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/DisallowSelectingViaConfigGui.java index ef5798d58..2e095f9f6 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/DisallowSelectingViaConfigGui.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/DisallowSelectingViaConfigGui.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EBlocksToAvoid.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBlocksToAvoid.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/config/EBlocksToAvoid.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBlocksToAvoid.java index 5120cd751..3e511d0c8 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EBlocksToAvoid.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBlocksToAvoid.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * NONE,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EBufferRebuildTimes.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/config/EBufferRebuildTimes.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java index c048e3c09..9e06b5be2 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EBufferRebuildTimes.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EBufferRebuildTimes.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * CONSTANT
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EGenerationPriority.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/config/EGenerationPriority.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java index 37709abf9..d8cc3a36d 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EGenerationPriority.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGenerationPriority.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * AUTO
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EGpuUploadMethod.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/enums/config/EGpuUploadMethod.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java index 8483f5f6a..56397436a 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EGpuUploadMethod.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EGpuUploadMethod.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * AUTO,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalQuality.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalQuality.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java index 1720731e7..bc2f17bf7 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalQuality.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EHorizontalQuality.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * LOWEST
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/ELightGenerationMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/config/ELightGenerationMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java index 8d945689d..c8ca28c0b 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/ELightGenerationMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELightGenerationMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * FAST,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/ELoggerMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELoggerMode.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/enums/config/ELoggerMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELoggerMode.java index 6b1069c82..299aa5a61 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/ELoggerMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/ELoggerMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; import org.apache.logging.log4j.Level; public enum ELoggerMode diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EMaxHorizontalResolution.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EMaxHorizontalResolution.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/enums/config/EMaxHorizontalResolution.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EMaxHorizontalResolution.java index 7e5696cbb..b36c00187 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EMaxHorizontalResolution.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EMaxHorizontalResolution.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; import java.util.ArrayList; import java.util.Collections; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; /** * BLOCK
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EOverdrawPrevention.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EOverdrawPrevention.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/config/EOverdrawPrevention.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EOverdrawPrevention.java index 49b7326a2..3a522e4a3 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EOverdrawPrevention.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EOverdrawPrevention.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * NONE
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EServerFolderNameMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/enums/config/EServerFolderNameMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java index b4aa4dd52..6d14b928e 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EServerFolderNameMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * NAME_ONLY,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EShadingMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EShadingMode.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/config/EShadingMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EShadingMode.java index 6c35599db..0c7ed80a0 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EShadingMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EShadingMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * NONE, GAME_SHADING diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EVanillaOverdraw.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/config/EVanillaOverdraw.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java index ff2d47feb..db8f35e9d 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EVanillaOverdraw.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVanillaOverdraw.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; /** * NEVER,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EVerticalQuality.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java similarity index 94% rename from api/src/main/java/com/seibel/lod/api/enums/config/EVerticalQuality.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java index 93b43a82e..ce4846982 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EVerticalQuality.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EVerticalQuality.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config; +package com.seibel.distanthorizons.api.enums.config; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; /** * HEIGHT_MAP
diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/quickOptions/EQualityPreset.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EQualityPreset.java similarity index 88% rename from api/src/main/java/com/seibel/lod/api/enums/config/quickOptions/EQualityPreset.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EQualityPreset.java index 4445fc7e2..c34d8e4d4 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/quickOptions/EQualityPreset.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EQualityPreset.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config.quickOptions; +package com.seibel.distanthorizons.api.enums.config.quickOptions; -import com.seibel.lod.api.enums.config.DisallowSelectingViaConfigGui; +import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui; /** * CUSTOM,

diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/quickOptions/EThreadPreset.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EThreadPreset.java similarity index 89% rename from api/src/main/java/com/seibel/lod/api/enums/config/quickOptions/EThreadPreset.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EThreadPreset.java index 3ca6f7409..cf08b58c3 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/quickOptions/EThreadPreset.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EThreadPreset.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.config.quickOptions; +package com.seibel.distanthorizons.api.enums.config.quickOptions; -import com.seibel.lod.api.enums.config.DisallowSelectingViaConfigGui; +import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui; /** * CUSTOM,

diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugRendering.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDebugRendering.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugRendering.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDebugRendering.java index 31bb51557..c10d5aeb1 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugRendering.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDebugRendering.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * OFF,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogColorMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogColorMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EFogColorMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogColorMode.java index 0f4f0f8cd..226be2934 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogColorMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogColorMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * USE_DEFAULT_FOG_COLOR,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDistance.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogDistance.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDistance.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogDistance.java index 0112f6c55..42764a3b0 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDistance.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogDistance.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * NEAR, FAR, or NEAR_AND_FAR. diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDrawMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogDrawMode.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDrawMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogDrawMode.java index 181d678d6..7c57affb0 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogDrawMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogDrawMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * USE_OPTIFINE_FOG_SETTING,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogFalloff.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogFalloff.java similarity index 86% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EFogFalloff.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogFalloff.java index 037e53d00..384a290b8 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EFogFalloff.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EFogFalloff.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * LINEAR,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EGLProxyContext.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EGLProxyContext.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EGLProxyContext.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EGLProxyContext.java index ad231fad6..897a32f78 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EGLProxyContext.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EGLProxyContext.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * Minecraft, Lod_Builder, None diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMixMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EHeightFogMixMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMixMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EHeightFogMixMode.java index ca93878f7..af7100d7c 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMixMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EHeightFogMixMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * BASIC
diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EHeightFogMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EHeightFogMode.java index 90dde7785..fee756f4c 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/EHeightFogMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EHeightFogMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * ABOVE_CAMERA,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/ERendererMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/ERendererMode.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/ERendererMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/ERendererMode.java index 9270479f9..e5f83edf1 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/ERendererMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/ERendererMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * Default diff --git a/api/src/main/java/com/seibel/lod/api/enums/rendering/ETransparency.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/ETransparency.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/enums/rendering/ETransparency.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/ETransparency.java index f2191a521..56bbe9eb2 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/rendering/ETransparency.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/ETransparency.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.rendering; +package com.seibel.distanthorizons.api.enums.rendering; /** * DISABLED,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java similarity index 98% rename from api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java index b048ff8eb..e46f7e957 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.enums.worldGeneration; +package com.seibel.distanthorizons.api.enums.worldGeneration; /** * PRE_EXISTING_ONLY
diff --git a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiLevelType.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiLevelType.java similarity index 75% rename from api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiLevelType.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiLevelType.java index 63039bcb2..f5312df34 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiLevelType.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiLevelType.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.enums.worldGeneration; +package com.seibel.distanthorizons.api.enums.worldGeneration; /** * SERVER_LEVEL,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java similarity index 90% rename from api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java index 8b3083ffa..a5e2d765a 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenThreadMode.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.enums.worldGeneration; +package com.seibel.distanthorizons.api.enums.worldGeneration; /** * MULTI_THREADED,
diff --git a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenerationStep.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenerationStep.java similarity index 93% rename from api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenerationStep.java rename to api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenerationStep.java index 23027a834..637ad2720 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/worldGeneration/EDhApiWorldGenerationStep.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiWorldGenerationStep.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.enums.worldGeneration; +package com.seibel.distanthorizons.api.enums.worldGeneration; /** * EMPTY,
diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/IDhApiUnsafeWrapper.java similarity index 91% rename from api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/IDhApiUnsafeWrapper.java index 0dcd5ec21..c0cd0b83c 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/IDhApiUnsafeWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.interfaces; +package com.seibel.distanthorizons.api.interfaces; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/block/IDhApiBiomeWrapper.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBiomeWrapper.java similarity index 88% rename from api/src/main/java/com/seibel/lod/api/interfaces/block/IDhApiBiomeWrapper.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBiomeWrapper.java index 6f8391c51..ac4323321 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/block/IDhApiBiomeWrapper.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBiomeWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.block; +package com.seibel.distanthorizons.api.interfaces.block; -import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; +import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/block/IDhApiBlockStateWrapper.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBlockStateWrapper.java similarity index 72% rename from api/src/main/java/com/seibel/lod/api/interfaces/block/IDhApiBlockStateWrapper.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBlockStateWrapper.java index 4de6ed862..51b05df34 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/block/IDhApiBlockStateWrapper.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBlockStateWrapper.java @@ -1,6 +1,6 @@ -package com.seibel.lod.api.interfaces.block; +package com.seibel.distanthorizons.api.interfaces.block; -import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; +import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper; /** * A Minecraft version independent way of handling Blocks. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfig.java similarity index 74% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfig.java index 27539682f..bb1e8330b 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfig.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.interfaces.config; +package com.seibel.distanthorizons.api.interfaces.config; -import com.seibel.lod.api.interfaces.config.both.IDhApiWorldGenerationConfig; -import com.seibel.lod.api.interfaces.config.client.*; +import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig; +import com.seibel.distanthorizons.api.interfaces.config.client.*; /** * This interfaces holds all config groups diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfigGroup.java similarity index 61% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfigGroup.java index ff9cbe300..0dae82a8c 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfigGroup.java @@ -1,6 +1,6 @@ -package com.seibel.lod.api.interfaces.config; +package com.seibel.distanthorizons.api.interfaces.config; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * This interface is just used to organize API config groups so diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigValue.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfigValue.java similarity index 96% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigValue.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfigValue.java index 1e2660fb8..1fe304503 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigValue.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/IDhApiConfigValue.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.interfaces.config; +package com.seibel.distanthorizons.api.interfaces.config; /** * An interface for Distant Horizon's Config. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/both/IDhApiWorldGenerationConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/both/IDhApiWorldGenerationConfig.java similarity index 79% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/both/IDhApiWorldGenerationConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/both/IDhApiWorldGenerationConfig.java index 1b68033c5..d1d401d83 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/both/IDhApiWorldGenerationConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/both/IDhApiWorldGenerationConfig.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.both; +package com.seibel.distanthorizons.api.interfaces.config.both; -import com.seibel.lod.api.enums.config.ELightGenerationMode; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.enums.config.ELightGenerationMode; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' world generation configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiDebuggingConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiDebuggingConfig.java similarity index 82% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiDebuggingConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiDebuggingConfig.java index e1b103dec..044f04ac2 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiDebuggingConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiDebuggingConfig.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.enums.rendering.EDebugRendering; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' debug configuration. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiFarFogConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java similarity index 87% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiFarFogConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java index 704c8cc37..b18f70ed7 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiFarFogConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java @@ -17,11 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.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.distanthorizons.api.enums.rendering.EFogFalloff; +import com.seibel.distanthorizons.api.enums.rendering.*; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; /** * Distant Horizons' fog configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiFogConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFogConfig.java similarity index 78% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiFogConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFogConfig.java index 841e253d2..123f5d09e 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiFogConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFogConfig.java @@ -17,11 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.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.distanthorizons.api.enums.rendering.EFogColorMode; +import com.seibel.distanthorizons.api.enums.rendering.EFogDistance; +import com.seibel.distanthorizons.api.enums.rendering.EFogDrawMode; +import com.seibel.distanthorizons.api.enums.rendering.*; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; /** * Distant Horizons' fog configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGpuBuffersConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGpuBuffersConfig.java similarity index 83% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGpuBuffersConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGpuBuffersConfig.java index 7a2043653..5ceca1acb 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGpuBuffersConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGpuBuffersConfig.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; /** * Distant Horizons' OpenGL buffer configuration. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java similarity index 91% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java index 3d83d325a..0cc751612 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiGraphicsConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java @@ -17,13 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.enums.config.*; -import com.seibel.lod.api.enums.rendering.ERendererMode; -import com.seibel.lod.api.enums.rendering.ETransparency; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.enums.config.*; +import com.seibel.distanthorizons.api.enums.config.*; +import com.seibel.distanthorizons.api.enums.rendering.ERendererMode; +import com.seibel.distanthorizons.api.enums.rendering.ETransparency; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' graphics/rendering configuration. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiHeightFogConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java similarity index 84% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiHeightFogConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java index ab05a7406..a7152f50f 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiHeightFogConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.enums.rendering.EFogFalloff; -import com.seibel.lod.api.enums.rendering.EHeightFogMixMode; -import com.seibel.lod.api.enums.rendering.EHeightFogMode; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.enums.rendering.EFogFalloff; +import com.seibel.distanthorizons.api.enums.rendering.EHeightFogMixMode; +import com.seibel.distanthorizons.api.enums.rendering.EHeightFogMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; /** * Distant Horizons' fog configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiLoggingConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiLoggingConfig.java similarity index 74% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiLoggingConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiLoggingConfig.java index d71214156..819cb7597 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiLoggingConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiLoggingConfig.java @@ -17,13 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.enums.rendering.EFogColorMode; -import com.seibel.lod.api.enums.rendering.EFogDistance; -import com.seibel.lod.api.enums.rendering.EFogDrawMode; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' fog configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiThreadingConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiMultiThreadingConfig.java similarity index 90% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiThreadingConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiMultiThreadingConfig.java index 617ee456c..2b4fdf649 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiThreadingConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiMultiThreadingConfig.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' threading configuration. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiplayerConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiMultiplayerConfig.java similarity index 85% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiplayerConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiMultiplayerConfig.java index d7392bb70..6f6244660 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiMultiplayerConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiMultiplayerConfig.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.enums.config.EServerFolderNameMode; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.enums.config.EServerFolderNameMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; /** * Distant Horizons' client-side multiplayer configuration. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiNoiseTextureConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java similarity index 85% rename from api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiNoiseTextureConfig.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java index 53ad891cb..2ccb2533d 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/client/IDhApiNoiseTextureConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.config.client; +package com.seibel.distanthorizons.api.interfaces.config.client; -import com.seibel.lod.api.interfaces.config.IDhApiConfigGroup; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; /** * Distant Horizons' noise texture configuration.

diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/data/IDhApiTerrainDataRepo.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/data/IDhApiTerrainDataRepo.java similarity index 89% rename from api/src/main/java/com/seibel/lod/api/interfaces/data/IDhApiTerrainDataRepo.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/data/IDhApiTerrainDataRepo.java index e9c8c52bc..36f3d99ea 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/data/IDhApiTerrainDataRepo.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/data/IDhApiTerrainDataRepo.java @@ -1,9 +1,9 @@ -package com.seibel.lod.api.interfaces.data; +package com.seibel.distanthorizons.api.interfaces.data; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.objects.DhApiResult; -import com.seibel.lod.api.objects.data.DhApiRaycastResult; -import com.seibel.lod.api.objects.data.DhApiTerrainDataPoint; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.objects.DhApiResult; +import com.seibel.distanthorizons.api.objects.data.DhApiRaycastResult; +import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint; /** * Used to interface with Distant Horizons' terrain data. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/events/IDhApiEventInjector.java similarity index 89% rename from api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/events/IDhApiEventInjector.java index 26e984055..3ef35e6db 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/events/IDhApiEventInjector.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.events; +package com.seibel.distanthorizons.api.interfaces.events; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IDependencyInjector; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IDependencyInjector; /** * This class takes care of dependency injection for API events. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/IDhApiOverrideable.java similarity index 64% rename from api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/IDhApiOverrideable.java index 292a789be..9c732aea2 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/IDhApiOverrideable.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.interfaces.override; +package com.seibel.distanthorizons.api.interfaces.override; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IOverrideInjector; /** * Implemented by all DhApi objects that can be overridden. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java similarity index 91% rename from api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java index 4ab8f8b27..4e75f1889 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java @@ -1,9 +1,9 @@ -package com.seibel.lod.api.interfaces.override.worldGenerator; +package com.seibel.distanthorizons.api.interfaces.override.worldGenerator; -import com.seibel.lod.api.enums.EDhApiDetailLevel; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.api.enums.EDhApiDetailLevel; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenThreadMode; import java.io.Closeable; import java.util.concurrent.CompletableFuture; diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java similarity index 74% rename from api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java index d22a6fd67..4af1d8bd9 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.interfaces.override.worldGenerator; +package com.seibel.distanthorizons.api.interfaces.override.worldGenerator; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.objects.DhApiResult; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.objects.DhApiResult; /** * Handles adding world generator overrides. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/render/IDhApiRenderProxy.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiRenderProxy.java similarity index 93% rename from api/src/main/java/com/seibel/lod/api/interfaces/render/IDhApiRenderProxy.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiRenderProxy.java index 8f79ed4cd..23d0e0e29 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/render/IDhApiRenderProxy.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiRenderProxy.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.render; +package com.seibel.distanthorizons.api.interfaces.render; -import com.seibel.lod.api.objects.DhApiResult; +import com.seibel.distanthorizons.api.objects.DhApiResult; /** * Used to interact with Distant Horizons rendering systems. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiChunkWrapper.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiChunkWrapper.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiChunkWrapper.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiChunkWrapper.java index 2700a9a29..030717601 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiChunkWrapper.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiChunkWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.world; +package com.seibel.distanthorizons.api.interfaces.world; -import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; +import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiDimensionTypeWrapper.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiDimensionTypeWrapper.java similarity index 89% rename from api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiDimensionTypeWrapper.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiDimensionTypeWrapper.java index f7bae58c6..2411671e7 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiDimensionTypeWrapper.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiDimensionTypeWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.world; +package com.seibel.distanthorizons.api.interfaces.world; -import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; +import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiLevelWrapper.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiLevelWrapper.java similarity index 86% rename from api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiLevelWrapper.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiLevelWrapper.java index a0669f23e..0cb0549d0 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiLevelWrapper.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiLevelWrapper.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.world; +package com.seibel.distanthorizons.api.interfaces.world; -import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; -import com.seibel.lod.api.enums.worldGeneration.EDhApiLevelType; +import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; /** * Can be either a Server or Client level. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiWorldProxy.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiWorldProxy.java similarity index 95% rename from api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiWorldProxy.java rename to api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiWorldProxy.java index 7724ea203..360b00c2f 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/world/IDhApiWorldProxy.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/world/IDhApiWorldProxy.java @@ -17,9 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.interfaces.world; - -import com.seibel.lod.api.interfaces.IDhApiUnsafeWrapper; +package com.seibel.distanthorizons.api.interfaces.world; /** * Used to interact with Distant Horizons current world. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/DhApiEventRegister.java similarity index 83% rename from api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/DhApiEventRegister.java index ba19a9c6a..7f2dce44f 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/DhApiEventRegister.java @@ -1,8 +1,8 @@ -package com.seibel.lod.api.methods.events; +package com.seibel.distanthorizons.api.methods.events; -import com.seibel.lod.api.objects.DhApiResult; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.api.objects.DhApiResult; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; /** * Handles adding/removing event handlers. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/Readme.md b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/Readme.md similarity index 100% rename from api/src/main/java/com/seibel/lod/api/methods/events/Readme.md rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/Readme.md diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java similarity index 75% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java index 0e6d619c8..076902a0b 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java similarity index 76% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java index 11b88fede..3e45ad01e 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java @@ -1,8 +1,8 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.methods.events.sharedParameterObjects.DhApiRenderParam; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java similarity index 75% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java index d4c21e303..dd6672f6b 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java @@ -1,9 +1,9 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java similarity index 77% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java index d0f839618..b4371aeee 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java @@ -1,8 +1,8 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.methods.events.sharedParameterObjects.DhApiRenderParam; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java similarity index 76% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java index e0b6c03df..6e96596bf 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java @@ -1,8 +1,8 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java similarity index 76% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java index 7748cc2a9..fe6b1d867 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java @@ -1,8 +1,8 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java similarity index 76% rename from api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java index 2e61b766a..f6ff3ab16 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java @@ -1,8 +1,8 @@ -package com.seibel.lod.api.methods.events.abstractEvents; +package com.seibel.distanthorizons.api.methods.events.abstractEvents; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * @author James Seibel diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/interfaces/IDhApiEvent.java similarity index 85% rename from api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/interfaces/IDhApiEvent.java index bbbd1e2df..cae76f9ca 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/interfaces/IDhApiEvent.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.methods.events.interfaces; +package com.seibel.distanthorizons.api.methods.events.interfaces; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * The interface used by all DH Api events. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/sharedParameterObjects/DhApiRenderParam.java similarity index 89% rename from api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/events/sharedParameterObjects/DhApiRenderParam.java index b2d3d33bf..21981bf0c 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/events/sharedParameterObjects/DhApiRenderParam.java @@ -1,6 +1,6 @@ -package com.seibel.lod.api.methods.events.sharedParameterObjects; +package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; /** * Parameter passed into Render events. diff --git a/api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java b/api/src/main/java/com/seibel/distanthorizons/api/methods/override/DhApiWorldGeneratorOverrideRegister.java similarity index 59% rename from api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java rename to api/src/main/java/com/seibel/distanthorizons/api/methods/override/DhApiWorldGeneratorOverrideRegister.java index 5986f484c..87f34bc61 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/methods/override/DhApiWorldGeneratorOverrideRegister.java @@ -1,10 +1,10 @@ -package com.seibel.lod.api.methods.override; +package com.seibel.distanthorizons.api.methods.override; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGeneratorOverrideRegister; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.objects.DhApiResult; -import com.seibel.lod.coreapi.DependencyInjection.WorldGeneratorInjector; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGeneratorOverrideRegister; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.objects.DhApiResult; +import com.seibel.distanthorizons.coreapi.DependencyInjection.WorldGeneratorInjector; /** * Handles adding world generator overrides. diff --git a/api/src/main/java/com/seibel/lod/api/methods/override/Readme.md b/api/src/main/java/com/seibel/distanthorizons/api/methods/override/Readme.md similarity index 100% rename from api/src/main/java/com/seibel/lod/api/methods/override/Readme.md rename to api/src/main/java/com/seibel/distanthorizons/api/methods/override/Readme.md diff --git a/api/src/main/java/com/seibel/lod/api/objects/DhApiResult.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/DhApiResult.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/objects/DhApiResult.java rename to api/src/main/java/com/seibel/distanthorizons/api/objects/DhApiResult.java index c25ca5ae1..b86dc9c90 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/DhApiResult.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/DhApiResult.java @@ -1,4 +1,4 @@ -package com.seibel.lod.api.objects; +package com.seibel.distanthorizons.api.objects; /** * Allows for more descriptive non-critical failure states. diff --git a/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java similarity index 88% rename from api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java rename to api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java index 9e952841e..669f2be2b 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java @@ -1,9 +1,9 @@ -package com.seibel.lod.api.objects.config; +package com.seibel.distanthorizons.api.objects.config; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.coreapi.interfaces.config.IConfigEntry; -import com.seibel.lod.coreapi.interfaces.config.IConverter; -import com.seibel.lod.coreapi.util.converters.DefaultConverter; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter; +import com.seibel.distanthorizons.coreapi.util.converters.DefaultConverter; /** * A wrapper used to interface with Distant Horizon's Config.

diff --git a/api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiRaycastResult.java similarity index 80% rename from api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java rename to api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiRaycastResult.java index 56cb3e03b..43b21a35c 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiRaycastResult.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.objects.data; +package com.seibel.distanthorizons.api.objects.data; -import com.seibel.lod.api.objects.math.DhApiVec3i; -import com.seibel.lod.coreapi.util.math.Vec3i; +import com.seibel.distanthorizons.api.objects.math.DhApiVec3i; +import com.seibel.distanthorizons.coreapi.util.math.Vec3i; /** * Holds a single datapoint of terrain data diff --git a/api/src/main/java/com/seibel/lod/api/objects/data/DhApiTerrainDataPoint.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiTerrainDataPoint.java similarity index 82% rename from api/src/main/java/com/seibel/lod/api/objects/data/DhApiTerrainDataPoint.java rename to api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiTerrainDataPoint.java index bc246fda6..69b72e1ca 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/data/DhApiTerrainDataPoint.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiTerrainDataPoint.java @@ -1,7 +1,7 @@ -package com.seibel.lod.api.objects.data; +package com.seibel.distanthorizons.api.objects.data; -import com.seibel.lod.api.interfaces.block.IDhApiBiomeWrapper; -import com.seibel.lod.api.interfaces.block.IDhApiBlockStateWrapper; +import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper; +import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper; /** * Holds a single datapoint of terrain data. diff --git a/api/src/main/java/com/seibel/lod/api/objects/events/DhApiEventDefinition.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/events/DhApiEventDefinition.java similarity index 87% rename from api/src/main/java/com/seibel/lod/api/objects/events/DhApiEventDefinition.java rename to api/src/main/java/com/seibel/distanthorizons/api/objects/events/DhApiEventDefinition.java index bb5c712e3..4f3d0c48c 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/events/DhApiEventDefinition.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/events/DhApiEventDefinition.java @@ -17,13 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.objects.events; - -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.HashMap; +package com.seibel.distanthorizons.api.objects.events; /** * The event definition includes meta information about how the event will behave. diff --git a/api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/math/DhApiVec3i.java similarity index 97% rename from api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java rename to api/src/main/java/com/seibel/distanthorizons/api/objects/math/DhApiVec3i.java index 92c6de7c6..f8f001e03 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/math/DhApiVec3i.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.api.objects.math; +package com.seibel.distanthorizons.api.objects.math; /** * Often used to store block positions or any other diff --git a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/ApiEventInjector.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/ApiEventInjector.java similarity index 93% rename from api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/ApiEventInjector.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/ApiEventInjector.java index 78d45b486..0488facb7 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/ApiEventInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/ApiEventInjector.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.DependencyInjection; +package com.seibel.distanthorizons.coreapi.DependencyInjection; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.coreapi.events.ApiEventDefinitionHandler; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.api.interfaces.events.IDhApiEventInjector; +import com.seibel.distanthorizons.api.interfaces.events.IDhApiEventInjector; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.coreapi.events.ApiEventDefinitionHandler; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/DependencyInjector.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/DependencyInjector.java similarity index 96% rename from api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/DependencyInjector.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/DependencyInjector.java index 2bd3b4381..ac3bf2beb 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/DependencyInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/DependencyInjector.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.DependencyInjection; +package com.seibel.distanthorizons.coreapi.DependencyInjection; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IDependencyInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IDependencyInjector; import java.util.ArrayList; import java.util.HashMap; diff --git a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverrideInjector.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/OverrideInjector.java similarity index 92% rename from api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverrideInjector.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/OverrideInjector.java index 4399a5646..80ac93158 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverrideInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/OverrideInjector.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.DependencyInjection; +package com.seibel.distanthorizons.coreapi.DependencyInjection; -import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector; -import com.seibel.lod.coreapi.util.StringUtil; +import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IOverrideInjector; +import com.seibel.distanthorizons.coreapi.util.StringUtil; import java.util.HashMap; @@ -53,7 +53,7 @@ public class OverrideInjector implements IOverrideInjector String thisPackageName = this.getClass().getPackage().getName(); int secondPackageEndingIndex = StringUtil.nthIndexOf(thisPackageName, ".", 3); - this.corePackagePath = thisPackageName.substring(0, secondPackageEndingIndex); // this should be "com.seibel.lod" + this.corePackagePath = thisPackageName.substring(0, secondPackageEndingIndex); // this should be "com.seibel.distanthorizons" } public OverrideInjector(String newCorePackagePath) { this.corePackagePath = newCorePackagePath; } diff --git a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverridePriorityListContainer.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/OverridePriorityListContainer.java similarity index 91% rename from api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverridePriorityListContainer.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/OverridePriorityListContainer.java index 77602f3a4..1f2714a99 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverridePriorityListContainer.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/OverridePriorityListContainer.java @@ -1,7 +1,7 @@ -package com.seibel.lod.coreapi.DependencyInjection; +package com.seibel.distanthorizons.coreapi.DependencyInjection; -import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import java.util.ArrayList; diff --git a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/WorldGeneratorInjector.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/WorldGeneratorInjector.java similarity index 90% rename from api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/WorldGeneratorInjector.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/WorldGeneratorInjector.java index 4c861aac1..6fdec4d94 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/WorldGeneratorInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/WorldGeneratorInjector.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.DependencyInjection; +package com.seibel.distanthorizons.coreapi.DependencyInjection; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.coreapi.util.StringUtil; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.util.StringUtil; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; import java.util.HashMap; @@ -51,7 +51,7 @@ public class WorldGeneratorInjector { String thisPackageName = this.getClass().getPackage().getName(); int secondPackageEndingIndex = StringUtil.nthIndexOf(thisPackageName, ".", 3); - this.corePackagePath = thisPackageName.substring(0, secondPackageEndingIndex); // this should be "com.seibel.lod" + this.corePackagePath = thisPackageName.substring(0, secondPackageEndingIndex); // this should be "com.seibel.distanthorizons" } /** This constructor should only be used for testing different corePackagePaths. */ diff --git a/api/src/main/java/com/seibel/lod/coreapi/ModInfo.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/ModInfo.java similarity index 94% rename from api/src/main/java/com/seibel/lod/coreapi/ModInfo.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/ModInfo.java index a3e8037ec..26e777d24 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/ModInfo.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/ModInfo.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi; +package com.seibel.distanthorizons.coreapi; /** * This file is similar to mcmod.info @@ -28,7 +28,7 @@ package com.seibel.lod.coreapi; */ public final class ModInfo { - public static final String ID = "lod"; + public static final String ID = "distanthorizons"; /** The internal protocol version used for networking */ public static final int PROTOCOL_VERSION = 1; /** The internal mod name */ diff --git a/api/src/main/java/com/seibel/lod/coreapi/events/ApiEventDefinitionHandler.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/events/ApiEventDefinitionHandler.java similarity index 90% rename from api/src/main/java/com/seibel/lod/coreapi/events/ApiEventDefinitionHandler.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/events/ApiEventDefinitionHandler.java index eddfa05db..da92ba5b9 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/events/ApiEventDefinitionHandler.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/events/ApiEventDefinitionHandler.java @@ -17,11 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.events; +package com.seibel.distanthorizons.coreapi.events; -import com.seibel.lod.api.methods.events.abstractEvents.*; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.*; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.*; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConfigEntry.java similarity index 95% rename from api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConfigEntry.java index 1d70c9041..a74e2ac4a 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConfigEntry.java @@ -1,4 +1,4 @@ -package com.seibel.lod.coreapi.interfaces.config; +package com.seibel.distanthorizons.coreapi.interfaces.config; /** diff --git a/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConverter.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConverter.java similarity index 86% rename from api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConverter.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConverter.java index eda3541cd..96b35c528 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConverter.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConverter.java @@ -1,4 +1,4 @@ -package com.seibel.lod.coreapi.interfaces.config; +package com.seibel.distanthorizons.coreapi.interfaces.config; /** diff --git a/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IBindable.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IBindable.java similarity index 95% rename from api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IBindable.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IBindable.java index 62c9e4dbe..b383513df 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IBindable.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IBindable.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.interfaces.dependencyInjection; +package com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection; /** * Necessary for all singletons that can be dependency injected. diff --git a/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IDependencyInjector.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IDependencyInjector.java similarity index 97% rename from api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IDependencyInjector.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IDependencyInjector.java index 02196528c..ef3b1e4bd 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IDependencyInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IDependencyInjector.java @@ -1,4 +1,4 @@ -package com.seibel.lod.coreapi.interfaces.dependencyInjection; +package com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection; import java.util.ArrayList; diff --git a/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IOverrideInjector.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IOverrideInjector.java similarity index 92% rename from api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IOverrideInjector.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IOverrideInjector.java index 212eee03f..3d1581edd 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IOverrideInjector.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/dependencyInjection/IOverrideInjector.java @@ -1,7 +1,7 @@ -package com.seibel.lod.coreapi.interfaces.dependencyInjection; +package com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection; -import com.seibel.lod.api.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable; public interface IOverrideInjector { diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/BitShiftUtil.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/BitShiftUtil.java similarity index 98% rename from api/src/main/java/com/seibel/lod/coreapi/util/BitShiftUtil.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/BitShiftUtil.java index 1a08205c9..76d579502 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/BitShiftUtil.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/BitShiftUtil.java @@ -1,4 +1,4 @@ -package com.seibel.lod.coreapi.util; +package com.seibel.distanthorizons.coreapi.util; /** * A list of helper methods to make code easier to read.
diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/MathUtil.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/MathUtil.java similarity index 97% rename from api/src/main/java/com/seibel/lod/coreapi/util/MathUtil.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/MathUtil.java index f6707354d..1dc713305 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/MathUtil.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/MathUtil.java @@ -1,4 +1,4 @@ -package com.seibel.lod.coreapi.util; +package com.seibel.distanthorizons.coreapi.util; public class MathUtil { diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/StringUtil.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/StringUtil.java similarity index 97% rename from api/src/main/java/com/seibel/lod/coreapi/util/StringUtil.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/StringUtil.java index 51ccd6aae..9a3a8f195 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/StringUtil.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/StringUtil.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.util; +package com.seibel.distanthorizons.coreapi.util; /** * Miscellaneous string helper functions. diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/converters/DefaultConverter.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/DefaultConverter.java similarity index 75% rename from api/src/main/java/com/seibel/lod/coreapi/util/converters/DefaultConverter.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/DefaultConverter.java index 7caf4df0b..2f66a13a5 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/converters/DefaultConverter.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/DefaultConverter.java @@ -1,6 +1,6 @@ -package com.seibel.lod.coreapi.util.converters; +package com.seibel.distanthorizons.coreapi.util.converters; -import com.seibel.lod.coreapi.interfaces.config.IConverter; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter; /** diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/converters/RenderModeEnabledConverter.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/RenderModeEnabledConverter.java similarity index 71% rename from api/src/main/java/com/seibel/lod/coreapi/util/converters/RenderModeEnabledConverter.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/RenderModeEnabledConverter.java index b28ef3c44..151be4ded 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/converters/RenderModeEnabledConverter.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/RenderModeEnabledConverter.java @@ -1,7 +1,7 @@ -package com.seibel.lod.coreapi.util.converters; +package com.seibel.distanthorizons.coreapi.util.converters; -import com.seibel.lod.api.enums.rendering.ERendererMode; -import com.seibel.lod.coreapi.interfaces.config.IConverter; +import com.seibel.distanthorizons.api.enums.rendering.ERendererMode; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter; /** * Used for simplifying the fake chunk rendering on/off setting. diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/math/Mat4f.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Mat4f.java similarity index 99% rename from api/src/main/java/com/seibel/lod/coreapi/util/math/Mat4f.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Mat4f.java index e27112c41..1ba8ff361 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/math/Mat4f.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Mat4f.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.util.math; +package com.seibel.distanthorizons.coreapi.util.math; import java.nio.FloatBuffer; diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3d.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3d.java similarity index 98% rename from api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3d.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3d.java index e9d245692..28dd5d8de 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3d.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3d.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.util.math; +package com.seibel.distanthorizons.coreapi.util.math; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; /** * This is closer to MC's implementation of a diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3f.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3f.java similarity index 98% rename from api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3f.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3f.java index 8f1e0de9a..1aa168579 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3f.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3f.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.util.math; +package com.seibel.distanthorizons.coreapi.util.math; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; /** * A (almost) exact copy of Minecraft's 1.16.5 diff --git a/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3i.java b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3i.java similarity index 95% rename from api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3i.java rename to api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3i.java index 86e76708a..6df27340b 100644 --- a/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3i.java +++ b/api/src/main/java/com/seibel/distanthorizons/coreapi/util/math/Vec3i.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.coreapi.util.math; +package com.seibel.distanthorizons.coreapi.util.math; -import com.seibel.lod.api.objects.math.DhApiVec3i; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; +import com.seibel.distanthorizons.api.objects.math.DhApiVec3i; /** * A (almost) exact copy of Minecraft's 1.16.5 diff --git a/api/src/test/java/testItems/events/abstractObjects/DhApiOneTimeTestEvent.java b/api/src/test/java/testItems/events/abstractObjects/DhApiOneTimeTestEvent.java index 76eef0c40..b13750116 100644 --- a/api/src/test/java/testItems/events/abstractObjects/DhApiOneTimeTestEvent.java +++ b/api/src/test/java/testItems/events/abstractObjects/DhApiOneTimeTestEvent.java @@ -1,7 +1,7 @@ package testItems.events.abstractObjects; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * A dummy event implementation used for unit testing. diff --git a/api/src/test/java/testItems/events/abstractObjects/DhApiTestEvent.java b/api/src/test/java/testItems/events/abstractObjects/DhApiTestEvent.java index c5bd373e3..92ac1b4da 100644 --- a/api/src/test/java/testItems/events/abstractObjects/DhApiTestEvent.java +++ b/api/src/test/java/testItems/events/abstractObjects/DhApiTestEvent.java @@ -1,7 +1,7 @@ package testItems.events.abstractObjects; -import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; /** * A dummy event implementation used for unit testing. diff --git a/api/src/test/java/tests/EventInjectorTest.java b/api/src/test/java/tests/EventInjectorTest.java index aeef222ee..b0f40b87b 100644 --- a/api/src/test/java/tests/EventInjectorTest.java +++ b/api/src/test/java/tests/EventInjectorTest.java @@ -1,9 +1,9 @@ package tests; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; -import com.seibel.lod.api.objects.events.DhApiEventDefinition; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; -import com.seibel.lod.coreapi.events.ApiEventDefinitionHandler; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.distanthorizons.api.objects.events.DhApiEventDefinition; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.coreapi.events.ApiEventDefinitionHandler; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/IReflectionHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java index 4b8dbb5af..f20788af3 100644 --- a/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/IReflectionHandler.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core; +package com.seibel.distanthorizons.core; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * A singleton used to get variables from methods diff --git a/core/src/main/java/com/seibel/lod/core/Initializer.java b/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java similarity index 51% rename from core/src/main/java/com/seibel/lod/core/Initializer.java rename to core/src/main/java/com/seibel/distanthorizons/core/Initializer.java index f75ef3ada..e28837e3b 100644 --- a/core/src/main/java/com/seibel/lod/core/Initializer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java @@ -1,13 +1,13 @@ -package com.seibel.lod.core; +package com.seibel.distanthorizons.core; -import com.seibel.lod.core.api.external.methods.config.DhApiConfig; -import com.seibel.lod.core.api.external.methods.data.DhApiTerrainDataRepo; -import com.seibel.lod.core.dataObjects.fullData.loader.CompleteFullDataSourceLoader; -import com.seibel.lod.core.dataObjects.fullData.loader.HighDetailIncompleteFullDataSourceLoader; -import com.seibel.lod.api.DhApi; -import com.seibel.lod.core.dataObjects.fullData.loader.LowDetailIncompleteFullDataSourceLoader; -import com.seibel.lod.core.render.DhApiRenderProxy; -import com.seibel.lod.core.world.DhApiWorldProxy; +import com.seibel.distanthorizons.core.world.DhApiWorldProxy; +import com.seibel.distanthorizons.core.api.external.methods.config.DhApiConfig; +import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo; +import com.seibel.distanthorizons.core.dataObjects.fullData.loader.CompleteFullDataSourceLoader; +import com.seibel.distanthorizons.core.dataObjects.fullData.loader.HighDetailIncompleteFullDataSourceLoader; +import com.seibel.distanthorizons.api.DhApi; +import com.seibel.distanthorizons.core.dataObjects.fullData.loader.LowDetailIncompleteFullDataSourceLoader; +import com.seibel.distanthorizons.core.render.DhApiRenderProxy; /** Handles first time Core setup. */ public class Initializer diff --git a/core/src/main/java/com/seibel/lod/core/ReflectionHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/ReflectionHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java index 322b126d6..e8e385b28 100644 --- a/core/src/main/java/com/seibel/lod/core/ReflectionHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/ReflectionHandler.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.core; +package com.seibel.distanthorizons.core; import java.lang.invoke.MethodHandles; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; import org.apache.logging.log4j.Logger; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java similarity index 60% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java index 578f898d7..9ab741df5 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/DhApiConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/DhApiConfig.java @@ -1,10 +1,11 @@ -package com.seibel.lod.core.api.external.methods.config; +package com.seibel.distanthorizons.core.api.external.methods.config; -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.*; -import com.seibel.lod.core.api.external.methods.config.client.*; -import com.seibel.lod.core.api.external.methods.config.common.DhApiWorldGenerationConfig; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfig; +import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig; +import com.seibel.distanthorizons.api.interfaces.config.client.*; +import com.seibel.distanthorizons.core.api.external.methods.config.client.*; +import com.seibel.distanthorizons.core.api.external.methods.config.common.DhApiWorldGenerationConfig; +import com.seibel.distanthorizons.core.api.external.methods.config.client.*; public class DhApiConfig implements IDhApiConfig { 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/distanthorizons/core/api/external/methods/config/client/DhApiDebuggingConfig.java similarity index 59% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiDebuggingConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiDebuggingConfig.java index af121db3e..26de8957f 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiDebuggingConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiDebuggingConfig.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -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.enums.rendering.EDebugRendering; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiDebuggingConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; public class DhApiDebuggingConfig implements IDhApiDebuggingConfig { @@ -34,18 +34,18 @@ public class DhApiDebuggingConfig implements IDhApiDebuggingConfig public IDhApiConfigValue debugRendering() - { return new DhApiConfigValue(Debugging.debugRendering); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.debugRendering); } public IDhApiConfigValue debugKeybindings() - { return new DhApiConfigValue(Debugging.enableDebugKeybindings); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.enableDebugKeybindings); } public IDhApiConfigValue renderWireframe() - { return new DhApiConfigValue(Debugging.renderWireframe); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.renderWireframe); } public IDhApiConfigValue lodOnlyMode() - { return new DhApiConfigValue(Debugging.lodOnlyMode); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.lodOnlyMode); } public IDhApiConfigValue debugWireframeRendering() - { return new DhApiConfigValue(Debugging.debugWireframeRendering); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.debugWireframeRendering); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiFarFogConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java similarity index 55% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiFarFogConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java index ad521180b..c78a812de 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiFarFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java @@ -17,14 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.enums.rendering.*; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiFarFogConfig; -import com.seibel.lod.api.interfaces.config.client.IDhApiFogConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.core.config.Config.Client.Advanced.Graphics.Fog; +import com.seibel.distanthorizons.api.enums.rendering.EFogFalloff; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; public class DhApiFarFogConfig implements IDhApiFarFogConfig { @@ -36,26 +35,26 @@ public class DhApiFarFogConfig implements IDhApiFarFogConfig @Override public IDhApiConfigValue farFogStartDistance() - { return new DhApiConfigValue(Fog.AdvancedFog.farFogStart); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.farFogStart); } @Override public IDhApiConfigValue farFogEndDistance() - { return new DhApiConfigValue(Fog.AdvancedFog.farFogEnd); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.farFogEnd); } @Override public IDhApiConfigValue farFogMinThickness() - { return new DhApiConfigValue(Fog.AdvancedFog.farFogMin); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.farFogMin); } @Override public IDhApiConfigValue farFogMaxThickness() - { return new DhApiConfigValue(Fog.AdvancedFog.farFogMax); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.farFogMax); } @Override public IDhApiConfigValue farFogFalloff() - { return new DhApiConfigValue(Fog.AdvancedFog.farFogFalloff); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.farFogFalloff); } @Override public IDhApiConfigValue farFogDensity() - { return new DhApiConfigValue(Fog.AdvancedFog.farFogDensity); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.farFogDensity); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiFogConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java similarity index 59% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiFogConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java index ae371c336..d188f839f 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFogConfig.java @@ -17,15 +17,17 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.enums.rendering.*; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiFarFogConfig; -import com.seibel.lod.api.interfaces.config.client.IDhApiFogConfig; -import com.seibel.lod.api.interfaces.config.client.IDhApiHeightFogConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.core.config.Config.Client.Advanced.Graphics.Fog; +import com.seibel.distanthorizons.api.enums.rendering.EFogColorMode; +import com.seibel.distanthorizons.api.enums.rendering.EFogDistance; +import com.seibel.distanthorizons.api.enums.rendering.EFogDrawMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; public class DhApiFogConfig implements IDhApiFogConfig { @@ -50,18 +52,18 @@ public class DhApiFogConfig implements IDhApiFogConfig @Override public IDhApiConfigValue distance() - { return new DhApiConfigValue<>(Fog.distance); } + { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.distance); } @Override public IDhApiConfigValue drawMode() - { return new DhApiConfigValue<>(Fog.drawMode); } + { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.drawMode); } @Override public IDhApiConfigValue color() - { return new DhApiConfigValue<>(Fog.colorMode); } + { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.colorMode); } @Override public IDhApiConfigValue disableVanillaFog() - { return new DhApiConfigValue<>(Fog.disableVanillaFog); } + { return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.disableVanillaFog); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGpuBuffersConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGpuBuffersConfig.java similarity index 69% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGpuBuffersConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGpuBuffersConfig.java index 659778da2..7833b7e67 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGpuBuffersConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGpuBuffersConfig.java @@ -17,14 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiGpuBuffersConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.Config.Client.Advanced.GpuBuffers; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiGpuBuffersConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; public class DhApiGpuBuffersConfig implements IDhApiGpuBuffersConfig { @@ -38,6 +37,6 @@ public class DhApiGpuBuffersConfig implements IDhApiGpuBuffersConfig { return new DhApiConfigValue<>(Config.Client.Advanced.GpuBuffers.gpuUploadMethod); } public IDhApiConfigValue gpuUploadPerMegabyteInMilliseconds() - { return new DhApiConfigValue<>(GpuBuffers.gpuUploadPerMegabyteInMilliseconds); } + { return new DhApiConfigValue<>(Config.Client.Advanced.GpuBuffers.gpuUploadPerMegabyteInMilliseconds); } } 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/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java similarity index 58% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java index 9de814045..867d6484c 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java @@ -17,20 +17,17 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.enums.config.*; -import com.seibel.lod.api.enums.rendering.ETransparency; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiFogConfig; -import com.seibel.lod.api.interfaces.config.client.IDhApiGraphicsConfig; -import com.seibel.lod.api.interfaces.config.client.IDhApiNoiseTextureConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.api.enums.rendering.ERendererMode; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.Config.Client.Advanced.Graphics.Quality; -import com.seibel.lod.core.config.Config.Client.Advanced.Debugging; -import com.seibel.lod.core.config.Config.Client.Advanced.Graphics.AdvancedGraphics; +import com.seibel.distanthorizons.api.enums.config.*; +import com.seibel.distanthorizons.api.enums.rendering.ETransparency; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiGraphicsConfig; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiNoiseTextureConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.api.enums.rendering.ERendererMode; +import com.seibel.distanthorizons.core.config.Config; public class DhApiGraphicsConfig implements IDhApiGraphicsConfig { @@ -55,7 +52,7 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig @Override public IDhApiConfigValue chunkRenderDistance() - { return new DhApiConfigValue(Quality.lodChunkRenderDistance); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistance); } @Override public IDhApiConfigValue renderingEnabled() @@ -63,7 +60,7 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig @Override public IDhApiConfigValue renderingMode() - { return new DhApiConfigValue(Debugging.rendererMode); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.rendererMode); } @@ -73,31 +70,31 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig @Override public IDhApiConfigValue maxHorizontalResolution() - { return new DhApiConfigValue(Quality.maxHorizontalResolution); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution); } @Override public IDhApiConfigValue verticalQuality() - { return new DhApiConfigValue(Quality.verticalQuality); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.verticalQuality); } @Override public IDhApiConfigValue horizontalQuality() - { return new DhApiConfigValue(Quality.horizontalQuality); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.horizontalQuality); } @Override public IDhApiConfigValue ambientOcclusion() - { return new DhApiConfigValue(Quality.ssao); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.ssao); } @Override public IDhApiConfigValue transparency() - { return new DhApiConfigValue(Quality.transparency); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.transparency); } @Override public IDhApiConfigValue blocksToAvoid() - { return new DhApiConfigValue(Quality.blocksToIgnore); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.blocksToIgnore); } @Override public IDhApiConfigValue tintWithAvoidedBlocks() - { return new DhApiConfigValue(Quality.tintWithAvoidedBlocks); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); } // TODO re-implement // @Override @@ -116,35 +113,35 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig @Override public IDhApiConfigValue overdrawPrevention() - { return new DhApiConfigValue(AdvancedGraphics.overdrawPrevention); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.overdrawPrevention); } @Override public IDhApiConfigValue brightnessMultiplier() - { return new DhApiConfigValue(AdvancedGraphics.brightnessMultiplier); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.brightnessMultiplier); } @Override public IDhApiConfigValue saturationMultiplier() - { return new DhApiConfigValue(AdvancedGraphics.saturationMultiplier); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.saturationMultiplier); } @Override public IDhApiConfigValue caveCullingEnabled() - { return new DhApiConfigValue(AdvancedGraphics.enableCaveCulling); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.enableCaveCulling); } @Override public IDhApiConfigValue caveCullingHeight() - { return new DhApiConfigValue(AdvancedGraphics.caveCullingHeight); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.caveCullingHeight); } @Override public IDhApiConfigValue earthCurvatureRatio() - { return new DhApiConfigValue(AdvancedGraphics.earthCurveRatio); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.earthCurveRatio); } @Override public IDhApiConfigValue lodOnlyMode() - { return new DhApiConfigValue(Debugging.lodOnlyMode); } + { return new DhApiConfigValue(Config.Client.Advanced.Debugging.lodOnlyMode); } @Override public IDhApiConfigValue lodBias() - { return new DhApiConfigValue(AdvancedGraphics.lodBias); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.AdvancedGraphics.lodBias); } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiHeightFogConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java similarity index 50% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiHeightFogConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java index c45ddf906..79d09d6b5 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiHeightFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java @@ -17,13 +17,15 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.enums.rendering.*; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiHeightFogConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.core.config.Config.Client.Advanced.Graphics.Fog; +import com.seibel.distanthorizons.api.enums.rendering.EFogFalloff; +import com.seibel.distanthorizons.api.enums.rendering.EHeightFogMixMode; +import com.seibel.distanthorizons.api.enums.rendering.EHeightFogMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; public class DhApiHeightFogConfig implements IDhApiHeightFogConfig { @@ -35,38 +37,38 @@ public class DhApiHeightFogConfig implements IDhApiHeightFogConfig @Override public IDhApiConfigValue heightFogMixMode() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogMixMode); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogMixMode); } @Override public IDhApiConfigValue heightFogMode() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogMode); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogMode); } @Override public IDhApiConfigValue heightFogBaseHeight() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogBaseHeight); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogBaseHeight); } @Override public IDhApiConfigValue heightFogStartingHeightPercent() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogStart); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogStart); } @Override public IDhApiConfigValue heightFogEndingHeightPercent() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogEnd); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogEnd); } @Override public IDhApiConfigValue heightFogMinThickness() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogMin); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogMin); } @Override public IDhApiConfigValue heightFogMaxThickness() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogMax); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogMax); } @Override public IDhApiConfigValue heightFogFalloff() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogFalloff); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogFalloff); } @Override public IDhApiConfigValue heightFogDensity() - { return new DhApiConfigValue(Fog.AdvancedFog.HeightFog.heightFogDensity); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.AdvancedFog.HeightFog.heightFogDensity); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java similarity index 58% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java index d7f36e496..b9e0e593d 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiMultiThreadingConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.core.config.Config.Client.Advanced.MultiThreading; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiThreadingConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig { @@ -34,22 +34,22 @@ public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig @Override public IDhApiConfigValue worldGeneratorThreads() - { return new DhApiConfigValue(MultiThreading.numberOfWorldGenerationThreads); } + { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfWorldGenerationThreads); } @Override public IDhApiConfigValue bufferBuilderThreads() - { return new DhApiConfigValue(MultiThreading.numberOfBufferBuilderThreads); } + { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfBufferBuilderThreads); } @Override public IDhApiConfigValue fileHandlerThreads() - { return new DhApiConfigValue(MultiThreading.numberOfFileHandlerThreads); } + { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfFileHandlerThreads); } @Override public IDhApiConfigValue dataConverterThreads() - { return new DhApiConfigValue(MultiThreading.numberOfDataConverterThreads); } + { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfDataConverterThreads); } @Override public IDhApiConfigValue chunkLodConverterThreads() - { return new DhApiConfigValue(MultiThreading.numberOfChunkLodConverterThreads); } + { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfChunkLodConverterThreads); } } 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/distanthorizons/core/api/external/methods/config/client/DhApiMultiplayerConfig.java similarity index 65% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiplayerConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiplayerConfig.java index c589e4a8c..61e232e37 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiMultiplayerConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiplayerConfig.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -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.Advanced.Multiplayer; -import com.seibel.lod.api.enums.config.EServerFolderNameMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiplayerConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.api.enums.config.EServerFolderNameMode; public class DhApiMultiplayerConfig implements IDhApiMultiplayerConfig { @@ -34,9 +34,9 @@ public class DhApiMultiplayerConfig implements IDhApiMultiplayerConfig public IDhApiConfigValue folderSavingMode() - { return new DhApiConfigValue(Multiplayer.serverFolderNameMode); } + { return new DhApiConfigValue(Config.Client.Advanced.Multiplayer.serverFolderNameMode); } public IDhApiConfigValue multiverseSimilarityRequirement() - { return new DhApiConfigValue(Multiplayer.multiverseSimilarityRequiredPercent); } + { return new DhApiConfigValue(Config.Client.Advanced.Multiplayer.multiverseSimilarityRequiredPercent); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java similarity index 60% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java index 093532d24..eff0162a2 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.client; +package com.seibel.distanthorizons.core.api.external.methods.config.client; -import com.seibel.lod.api.interfaces.config.IDhApiConfigValue; -import com.seibel.lod.api.interfaces.config.client.IDhApiNoiseTextureConfig; -import com.seibel.lod.api.objects.config.DhApiConfigValue; -import com.seibel.lod.core.config.Config.Client.Advanced.Graphics.NoiseTextureSettings; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiNoiseTextureConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config; public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig { @@ -34,18 +34,18 @@ public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig @Override public IDhApiConfigValue noiseEnabled() - { return new DhApiConfigValue(NoiseTextureSettings.noiseEnabled); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTextureSettings.noiseEnabled); } @Override public IDhApiConfigValue noiseSteps() - { return new DhApiConfigValue(NoiseTextureSettings.noiseSteps); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTextureSettings.noiseSteps); } @Override public IDhApiConfigValue noiseIntensity() - { return new DhApiConfigValue(NoiseTextureSettings.noiseIntensity); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTextureSettings.noiseIntensity); } @Override public IDhApiConfigValue noiseDropoff() - { return new DhApiConfigValue(NoiseTextureSettings.noiseDropoff); } + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTextureSettings.noiseDropoff); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java similarity index 74% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java index 70422af8f..45971c836 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java @@ -17,16 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.external.methods.config.common; +package com.seibel.distanthorizons.core.api.external.methods.config.common; -import com.seibel.lod.api.enums.config.ELightGenerationMode; -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; -import com.seibel.lod.core.config.Config.Client.Advanced.WorldGenerator; -import com.seibel.lod.api.enums.config.EBlocksToAvoid; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.api.enums.config.ELightGenerationMode; +import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue; +import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig; +import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue; +import com.seibel.distanthorizons.core.config.Config.Client.Advanced.WorldGenerator; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; /** * Distant Horizons' world generation configuration.

diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java index 18f11f5db..1b07121d1 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java @@ -1,30 +1,32 @@ -package com.seibel.lod.core.api.external.methods.data; +package com.seibel.distanthorizons.core.api.external.methods.data; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.objects.DhApiResult; -import com.seibel.lod.api.objects.data.DhApiRaycastResult; -import com.seibel.lod.api.objects.data.DhApiTerrainDataPoint; -import com.seibel.lod.api.interfaces.data.IDhApiTerrainDataRepo; -import com.seibel.lod.api.objects.math.DhApiVec3i; -import com.seibel.lod.core.api.internal.SharedApi; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.*; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.coreapi.util.math.Vec3d; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.coreapi.util.math.Vec3i; -import com.seibel.lod.core.world.AbstractDhWorld; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.objects.DhApiResult; +import com.seibel.distanthorizons.api.objects.data.DhApiRaycastResult; +import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint; +import com.seibel.distanthorizons.api.interfaces.data.IDhApiTerrainDataRepo; +import com.seibel.distanthorizons.api.objects.math.DhApiVec3i; +import com.seibel.distanthorizons.core.api.internal.SharedApi; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.RayCastUtil; +import com.seibel.distanthorizons.core.world.AbstractDhWorld; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.util.*; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.coreapi.util.math.Vec3d; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3i; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -180,7 +182,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo { // custom level wrappers aren't supported, // the API user must get a level wrapper from our code somewhere - return DhApiResult.createFail("Unsupported ["+IDhApiLevelWrapper.class.getSimpleName()+"] implementation, only the core class ["+IDhLevel.class.getSimpleName()+"] is a valid parameter."); + return DhApiResult.createFail("Unsupported ["+IDhApiLevelWrapper.class.getSimpleName()+"] implementation, only the core class ["+ IDhLevel.class.getSimpleName()+"] is a valid parameter."); } ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper; diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java index 6cf7e9bc0..f1f4cbb34 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java @@ -17,34 +17,34 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.internal; +package com.seibel.distanthorizons.core.api.internal; -import com.seibel.lod.api.methods.events.abstractEvents.*; -import com.seibel.lod.api.methods.events.sharedParameterObjects.DhApiRenderParam; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.api.enums.rendering.EDebugRendering; -import com.seibel.lod.api.enums.rendering.ERendererMode; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.logging.ConfigBasedSpamLogger; -import com.seibel.lod.core.logging.SpamReducedLogger; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.core.render.renderer.TestRenderer; -import com.seibel.lod.core.util.RenderUtil; -import com.seibel.lod.core.world.DhClientWorld; -import com.seibel.lod.core.world.AbstractDhWorld; -import com.seibel.lod.core.world.IDhClientWorld; -import com.seibel.lod.core.world.EWorldEnvironment; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.*; +import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; +import com.seibel.distanthorizons.api.enums.rendering.ERendererMode; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; +import com.seibel.distanthorizons.core.logging.SpamReducedLogger; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.renderer.TestRenderer; +import com.seibel.distanthorizons.core.util.RenderUtil; +import com.seibel.distanthorizons.core.world.DhClientWorld; +import com.seibel.distanthorizons.core.world.AbstractDhWorld; +import com.seibel.distanthorizons.core.world.IDhClientWorld; +import com.seibel.distanthorizons.core.world.EWorldEnvironment; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.glfw.GLFW; diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java similarity index 81% rename from core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java index 85f55b2dc..1058d1763 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java @@ -17,21 +17,21 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.api.internal; +package com.seibel.distanthorizons.core.api.internal; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiLevelLoadEvent; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiLevelSaveEvent; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiLevelUnloadEvent; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.world.AbstractDhWorld; -import com.seibel.lod.core.world.DhClientServerWorld; -import com.seibel.lod.core.world.DhServerWorld; -import com.seibel.lod.core.world.IDhServerWorld; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelSaveEvent; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelUnloadEvent; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.world.AbstractDhWorld; +import com.seibel.distanthorizons.core.world.DhClientServerWorld; +import com.seibel.distanthorizons.core.world.DhServerWorld; +import com.seibel.distanthorizons.core.world.IDhServerWorld; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import org.apache.logging.log4j.Logger; /** diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java similarity index 79% rename from core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java rename to core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java index 2121d9618..c6a063850 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java @@ -1,12 +1,12 @@ -package com.seibel.lod.core.api.internal; +package com.seibel.distanthorizons.core.api.internal; -import com.seibel.lod.core.Initializer; -import com.seibel.lod.core.dataObjects.render.bufferBuilding.ColumnRenderBufferBuilder; -import com.seibel.lod.core.dataObjects.transformers.DataRenderTransformer; -import com.seibel.lod.core.file.fullDatafile.FullDataFileHandler; -import com.seibel.lod.core.generation.WorldGenerationQueue; -import com.seibel.lod.core.world.*; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; +import com.seibel.distanthorizons.core.Initializer; +import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.ColumnRenderBufferBuilder; +import com.seibel.distanthorizons.core.dataObjects.transformers.DataRenderTransformer; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataFileHandler; +import com.seibel.distanthorizons.core.generation.WorldGenerationQueue; +import com.seibel.distanthorizons.core.world.*; +import com.seibel.distanthorizons.core.world.*; /** Contains code and variables used by both {@link ClientApi} and {@link ServerApi} */ public class SharedApi diff --git a/core/src/main/java/com/seibel/lod/core/config/AppliedConfigState.java b/core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/config/AppliedConfigState.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java index f6322ac50..658b374e8 100644 --- a/core/src/main/java/com/seibel/lod/core/config/AppliedConfigState.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/AppliedConfigState.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config; +package com.seibel.distanthorizons.core.config; -import com.seibel.lod.core.config.types.ConfigEntry; +import com.seibel.distanthorizons.core.config.types.ConfigEntry; // TODO: Make this intergrate with the config system public class AppliedConfigState diff --git a/core/src/main/java/com/seibel/lod/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/config/Config.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index b0ea45b41..d0f040699 100644 --- a/core/src/main/java/com/seibel/lod/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -17,20 +17,26 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.config; +package com.seibel.distanthorizons.core.config; -import com.seibel.lod.api.enums.config.*; -import com.seibel.lod.api.enums.config.quickOptions.EQualityPreset; -import com.seibel.lod.api.enums.config.quickOptions.EThreadPreset; -import com.seibel.lod.api.enums.rendering.*; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; -import com.seibel.lod.core.config.eventHandlers.presets.RenderQualityPresetConfigEventHandler; -import com.seibel.lod.core.config.eventHandlers.RenderCacheConfigEventHandler; -import com.seibel.lod.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler; -import com.seibel.lod.core.config.types.*; -import com.seibel.lod.core.config.types.enums.*; -import com.seibel.lod.coreapi.ModInfo; +import com.seibel.distanthorizons.api.enums.config.*; +import com.seibel.distanthorizons.api.enums.rendering.*; +import com.seibel.distanthorizons.api.enums.config.quickOptions.EQualityPreset; +import com.seibel.distanthorizons.api.enums.config.quickOptions.EThreadPreset; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.core.config.eventHandlers.RenderCacheConfigEventHandler; +import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler; +import com.seibel.distanthorizons.core.config.eventHandlers.presets.RenderQualityPresetConfigEventHandler; +import com.seibel.distanthorizons.core.config.types.ConfigCategory; +import com.seibel.distanthorizons.core.config.types.ConfigEntry; +import com.seibel.distanthorizons.core.config.types.ConfigLinkedEntry; +import com.seibel.distanthorizons.core.config.types.ConfigUIComment; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryPerformance; +import com.seibel.distanthorizons.core.config.types.*; +import com.seibel.distanthorizons.core.config.types.enums.*; +import com.seibel.distanthorizons.coreapi.ModInfo; import java.util.*; diff --git a/core/src/main/java/com/seibel/lod/core/config/ConfigBase.java b/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/config/ConfigBase.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java index ae0176b20..580f92143 100644 --- a/core/src/main/java/com/seibel/lod/core/config/ConfigBase.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigBase.java @@ -1,12 +1,12 @@ -package com.seibel.lod.core.config; +package com.seibel.distanthorizons.core.config; -import com.seibel.lod.core.config.file.ConfigFileHandling; -import com.seibel.lod.core.config.types.AbstractConfigType; -import com.seibel.lod.core.config.types.ConfigCategory; -import com.seibel.lod.core.config.types.ConfigEntry; -import com.seibel.lod.core.config.types.ConfigLinkedEntry; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.config.ILangWrapper; +import com.seibel.distanthorizons.core.config.file.ConfigFileHandling; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.config.types.AbstractConfigType; +import com.seibel.distanthorizons.core.config.types.ConfigCategory; +import com.seibel.distanthorizons.core.config.types.ConfigEntry; +import com.seibel.distanthorizons.core.config.types.ConfigLinkedEntry; +import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/config/ConfigEntryWithPresetOptions.java b/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigEntryWithPresetOptions.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/config/ConfigEntryWithPresetOptions.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/ConfigEntryWithPresetOptions.java index 6e6ca64d3..175dead64 100644 --- a/core/src/main/java/com/seibel/lod/core/config/ConfigEntryWithPresetOptions.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/ConfigEntryWithPresetOptions.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config; +package com.seibel.distanthorizons.core.config; -import com.seibel.lod.core.config.types.ConfigEntry; +import com.seibel.distanthorizons.core.config.types.ConfigEntry; import java.util.HashMap; import java.util.HashSet; diff --git a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java similarity index 82% rename from core/src/main/java/com/seibel/lod/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java index 73a671dfd..5f5a5a12a 100644 --- a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/QuickRenderToggleConfigEventHandler.java @@ -1,8 +1,8 @@ -package com.seibel.lod.core.config.eventHandlers; +package com.seibel.distanthorizons.core.config.eventHandlers; -import com.seibel.lod.api.enums.rendering.ERendererMode; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.api.enums.rendering.ERendererMode; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.config.Config; public class QuickRenderToggleConfigEventHandler { diff --git a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/RenderCacheConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/config/eventHandlers/RenderCacheConfigEventHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java index 1f62fd510..a88979cf2 100644 --- a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/RenderCacheConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderCacheConfigEventHandler.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.config.eventHandlers; +package com.seibel.distanthorizons.core.config.eventHandlers; -import com.seibel.lod.api.DhApi; -import com.seibel.lod.api.enums.config.EMaxHorizontalResolution; -import com.seibel.lod.api.enums.config.EVerticalQuality; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.IConfigListener; +import com.seibel.distanthorizons.api.DhApi; +import com.seibel.distanthorizons.api.enums.config.EMaxHorizontalResolution; +import com.seibel.distanthorizons.api.enums.config.EVerticalQuality; +import com.seibel.distanthorizons.core.config.listeners.IConfigListener; +import com.seibel.distanthorizons.core.config.Config; import java.util.Timer; import java.util.TimerTask; diff --git a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/ResetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java similarity index 76% rename from core/src/main/java/com/seibel/lod/core/config/eventHandlers/ResetConfigEventHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java index 720d56b15..7c05ed28f 100644 --- a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/ResetConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/ResetConfigEventHandler.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.config.eventHandlers; +package com.seibel.distanthorizons.core.config.eventHandlers; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.config.Config; public class ResetConfigEventHandler { diff --git a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java index 7351a1e84..2cfb8d104 100644 --- a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.config.eventHandlers.presets; +package com.seibel.distanthorizons.core.config.eventHandlers.presets; -import com.seibel.lod.core.config.ConfigEntryWithPresetOptions; -import com.seibel.lod.core.config.listeners.IConfigListener; -import com.seibel.lod.coreapi.interfaces.config.IConfigEntry; -import com.seibel.lod.coreapi.util.StringUtil; +import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions; +import com.seibel.distanthorizons.core.config.listeners.IConfigListener; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry; +import com.seibel.distanthorizons.coreapi.util.StringUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java index dafc077da..a40c1ad78 100644 --- a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/RenderQualityPresetConfigEventHandler.java @@ -1,14 +1,14 @@ -package com.seibel.lod.core.config.eventHandlers.presets; +package com.seibel.distanthorizons.core.config.eventHandlers.presets; -import com.seibel.lod.api.enums.config.EHorizontalQuality; -import com.seibel.lod.api.enums.config.EMaxHorizontalResolution; -import com.seibel.lod.api.enums.config.EVerticalQuality; -import com.seibel.lod.api.enums.config.quickOptions.EQualityPreset; -import com.seibel.lod.api.enums.rendering.ETransparency; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.ConfigEntryWithPresetOptions; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.coreapi.interfaces.config.IConfigEntry; +import com.seibel.distanthorizons.api.enums.config.EHorizontalQuality; +import com.seibel.distanthorizons.api.enums.config.EMaxHorizontalResolution; +import com.seibel.distanthorizons.api.enums.config.EVerticalQuality; +import com.seibel.distanthorizons.api.enums.config.quickOptions.EQualityPreset; +import com.seibel.distanthorizons.api.enums.rendering.ETransparency; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java index 7946f9309..85c2465a4 100644 --- a/core/src/main/java/com/seibel/lod/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.config.eventHandlers.presets; +package com.seibel.distanthorizons.core.config.eventHandlers.presets; -import com.seibel.lod.api.enums.config.quickOptions.EThreadPreset; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.ConfigEntryWithPresetOptions; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.coreapi.interfaces.config.IConfigEntry; +import com.seibel.distanthorizons.api.enums.config.quickOptions.EThreadPreset; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java index ec6bec0c1..2f51a9571 100644 --- a/core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java @@ -1,12 +1,12 @@ -package com.seibel.lod.core.config.file; +package com.seibel.distanthorizons.core.config.file; import com.electronwill.nightconfig.core.file.CommentedFileConfig; -import com.seibel.lod.core.config.ConfigBase; -import com.seibel.lod.core.config.types.AbstractConfigType; -import com.seibel.lod.core.config.types.ConfigEntry; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.config.ConfigBase; +import com.seibel.distanthorizons.core.config.types.AbstractConfigType; +import com.seibel.distanthorizons.core.config.types.ConfigEntry; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; import org.apache.logging.log4j.Logger; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/config/file/ConfigTypeConverters.java b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/config/file/ConfigTypeConverters.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java index f7fa0033c..a02c2739b 100644 --- a/core/src/main/java/com/seibel/lod/core/config/file/ConfigTypeConverters.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.file; +package com.seibel.distanthorizons.core.config.file; import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.io.ParsingMode; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/AbstractScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/config/gui/AbstractScreen.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java index 3166ab3f8..687ceef9d 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/AbstractScreen.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/AbstractScreen.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.gui; +package com.seibel.distanthorizons.core.config.gui; import java.net.URI; import java.nio.file.Path; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java index 4b6b3269b..7cffb7ac4 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/ConfigScreen.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/ConfigScreen.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.gui; +package com.seibel.distanthorizons.core.config.gui; import javax.swing.*; import java.awt.*; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/EmbeddedFrameUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/config/gui/EmbeddedFrameUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java index 7d6898010..1cf49ddc7 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/EmbeddedFrameUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config.gui; +package com.seibel.distanthorizons.core.config.gui; -import com.seibel.lod.core.jar.Platform; +import com.seibel.distanthorizons.core.jar.Platform; import org.jetbrains.annotations.NotNull; import org.lwjgl.system.jawt.JAWT; import org.lwjgl.system.macosx.*; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/JavaScreenHandlerScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/config/gui/JavaScreenHandlerScreen.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java index 1a94898e8..418995e78 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/JavaScreenHandlerScreen.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.gui; +package com.seibel.distanthorizons.core.config.gui; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/OpenGLConfigScreen.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/config/gui/OpenGLConfigScreen.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java index aa867277a..8c38429f7 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/OpenGLConfigScreen.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/OpenGLConfigScreen.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.config.gui; +package com.seibel.distanthorizons.core.config.gui; -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; -import com.seibel.lod.core.render.glObject.shader.ShaderProgram; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttribute; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.GLState; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttribute; import org.lwjgl.opengl.GL32; import java.nio.ByteBuffer; diff --git a/core/src/main/java/com/seibel/lod/core/config/gui/standaloneTests/TestConfigMain.java b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/standaloneTests/TestConfigMain.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/config/gui/standaloneTests/TestConfigMain.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/gui/standaloneTests/TestConfigMain.java index 59bb61fd1..f7b893722 100644 --- a/core/src/main/java/com/seibel/lod/core/config/gui/standaloneTests/TestConfigMain.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/gui/standaloneTests/TestConfigMain.java @@ -1,8 +1,8 @@ -package com.seibel.lod.core.config.gui.standaloneTests; +package com.seibel.distanthorizons.core.config.gui.standaloneTests; -import com.seibel.lod.core.config.gui.AbstractScreen; -import com.seibel.lod.core.config.gui.OpenGLConfigScreen; -import com.seibel.lod.core.pos.Pos2D; +import com.seibel.distanthorizons.core.config.gui.AbstractScreen; +import com.seibel.distanthorizons.core.config.gui.OpenGLConfigScreen; +import com.seibel.distanthorizons.core.pos.Pos2D; import org.lwjgl.*; import org.lwjgl.glfw.*; import org.lwjgl.opengl.*; diff --git a/core/src/main/java/com/seibel/lod/core/config/listeners/ConfigChangeListener.java b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/config/listeners/ConfigChangeListener.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java index 9d99653fd..25ee5ce67 100644 --- a/core/src/main/java/com/seibel/lod/core/config/listeners/ConfigChangeListener.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/ConfigChangeListener.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config.listeners; +package com.seibel.distanthorizons.core.config.listeners; -import com.seibel.lod.core.config.types.ConfigEntry; +import com.seibel.distanthorizons.core.config.types.ConfigEntry; import java.io.Closeable; import java.util.function.Consumer; diff --git a/core/src/main/java/com/seibel/lod/core/config/listeners/IConfigListener.java b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/config/listeners/IConfigListener.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java index e037243ad..f7f2f6a08 100644 --- a/core/src/main/java/com/seibel/lod/core/config/listeners/IConfigListener.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/listeners/IConfigListener.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.listeners; +package com.seibel.distanthorizons.core.config.listeners; public interface IConfigListener { diff --git a/core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java index e6b866f78..3d71f227c 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigType.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.config.types; +package com.seibel.distanthorizons.core.config.types; -import com.seibel.lod.core.config.ConfigBase; -import com.seibel.lod.core.config.types.enums.EConfigEntryAppearance; +import com.seibel.distanthorizons.core.config.ConfigBase; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance; /** * The class where all config options should extend diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java index b51913e13..cb282fc37 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigCategory.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config.types; +package com.seibel.distanthorizons.core.config.types; -import com.seibel.lod.core.config.types.enums.EConfigEntryAppearance; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance; /** * Adds a categoty to the config diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java index 602cbf7cc..a0a3a7ede 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java @@ -1,9 +1,11 @@ -package com.seibel.lod.core.config.types; +package com.seibel.distanthorizons.core.config.types; -import com.seibel.lod.core.config.listeners.IConfigListener; -import com.seibel.lod.core.config.types.enums.*; -import com.seibel.lod.coreapi.interfaces.config.IConfigEntry; +import com.seibel.distanthorizons.core.config.listeners.IConfigListener; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryPerformance; +import com.seibel.distanthorizons.core.config.types.enums.*; +import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigLinkedEntry.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigLinkedEntry.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/config/types/ConfigLinkedEntry.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigLinkedEntry.java index 69f19301d..debfb97d9 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigLinkedEntry.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigLinkedEntry.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config.types; +package com.seibel.distanthorizons.core.config.types; -import com.seibel.lod.core.config.types.enums.EConfigEntryAppearance; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance; /** * Creates a UI element that copies everything from another element. diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigUIComment.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigUIComment.java index e434b1341..75f8e075b 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigUIComment.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.config.types; +package com.seibel.distanthorizons.core.config.types; -import com.seibel.lod.core.config.types.enums.EConfigEntryAppearance; +import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance; /** * Adds something like a ConfigEntry but without a button to change the input diff --git a/core/src/main/java/com/seibel/lod/core/config/types/enums/EConfigEntryAppearance.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryAppearance.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/config/types/enums/EConfigEntryAppearance.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryAppearance.java index 61c0e73ae..d4e40f27c 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/enums/EConfigEntryAppearance.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryAppearance.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.types.enums; +package com.seibel.distanthorizons.core.config.types.enums; /** * Allows config entries (including options and categories) to only be shown in the file, or only in the ui diff --git a/core/src/main/java/com/seibel/lod/core/config/types/enums/EConfigEntryPerformance.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryPerformance.java similarity index 79% rename from core/src/main/java/com/seibel/lod/core/config/types/enums/EConfigEntryPerformance.java rename to core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryPerformance.java index a71ffa9c0..eebff2ea0 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/enums/EConfigEntryPerformance.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryPerformance.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.types.enums; +package com.seibel.distanthorizons.core.config.types.enums; /** * What is the performance impact of an entry diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataDownSampler.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataDownSampler.java index 660593d24..44015411d 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataDownSampler.java @@ -1,13 +1,13 @@ -package com.seibel.lod.core.dataObjects.fullData; +package com.seibel.distanthorizons.core.dataObjects.fullData; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.LodUtil; import org.apache.logging.log4j.Logger; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataPointIdMap.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataPointIdMap.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java index f0d530ce0..5c818cd44 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataPointIdMap.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java @@ -1,10 +1,12 @@ -package com.seibel.lod.core.dataObjects.fullData; +package com.seibel.distanthorizons.core.dataObjects.fullData; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.util.objects.dataStreams.*; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.util.objects.dataStreams.*; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import java.io.*; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/ChunkSizedFullDataAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/ChunkSizedFullDataAccessor.java similarity index 76% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/ChunkSizedFullDataAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/ChunkSizedFullDataAccessor.java index 765cf1050..d0787561b 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/ChunkSizedFullDataAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/ChunkSizedFullDataAccessor.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.accessor; +package com.seibel.distanthorizons.core.dataObjects.fullData.accessor; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; /** * A more specific version of {@link FullDataArrayAccessor} diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java index 7ac5ef6ab..85161cbd8 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.accessor; +package com.seibel.distanthorizons.core.dataObjects.fullData.accessor; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; /** * Contains Full Data points and basic methods for getting and setting them.
diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/IFullDataAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/IFullDataAccessor.java similarity index 79% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/IFullDataAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/IFullDataAccessor.java index 514096110..3601ff09e 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/IFullDataAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/IFullDataAccessor.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.dataObjects.fullData.accessor; +package com.seibel.distanthorizons.core.dataObjects.fullData.accessor; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/SingleColumnFullDataAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/SingleColumnFullDataAccessor.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/SingleColumnFullDataAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/SingleColumnFullDataAccessor.java index a21640900..ea60222e7 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/SingleColumnFullDataAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/SingleColumnFullDataAccessor.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.dataObjects.fullData.accessor; +package com.seibel.distanthorizons.core.dataObjects.fullData.accessor; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; /** * Represents a single column of Full LOD data. diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java index ad515e8a2..869cc1975 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.loader; +package com.seibel.distanthorizons.core.dataObjects.fullData.loader; import com.google.common.collect.HashMultimap; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; import java.io.IOException; import java.util.*; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java similarity index 58% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java index ecbd36c04..3c4d1903c 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.loader; +package com.seibel.distanthorizons.core.dataObjects.fullData.loader; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java similarity index 59% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java index c6a72521d..906fb8cc9 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.loader; +package com.seibel.distanthorizons.core.dataObjects.fullData.loader; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java similarity index 60% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java index 20d445d9d..6486d1dff 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.loader; +package com.seibel.distanthorizons.core.dataObjects.fullData.loader; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/CompleteFullDataSource.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/CompleteFullDataSource.java index a97f1a41c..b5429c239 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/CompleteFullDataSource.java @@ -1,26 +1,27 @@ -package com.seibel.lod.core.dataObjects.fullData.sources; +package com.seibel.distanthorizons.core.dataObjects.fullData.sources; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.objects.dataStreams.*; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.FullDataArrayAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.objects.dataStreams.*; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; import org.apache.logging.log4j.Logger; import java.io.*; -import java.util.ArrayList; /** * This data source contains every datapoint over its given {@link DhSectionPos}. diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java index 6d244bb07..8e58f1584 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java @@ -1,26 +1,27 @@ -package com.seibel.lod.core.dataObjects.fullData.sources; +package com.seibel.distanthorizons.core.dataObjects.fullData.sources; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.objects.dataStreams.*; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.FullDataArrayAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.objects.dataStreams.*; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; import org.apache.logging.log4j.Logger; import java.io.*; -import java.util.ArrayList; import java.util.BitSet; /** diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java index 9758951c6..9d14ab05e 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java @@ -1,26 +1,27 @@ -package com.seibel.lod.core.dataObjects.fullData.sources; +package com.seibel.distanthorizons.core.dataObjects.fullData.sources; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.objects.dataStreams.*; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.FullDataArrayAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.util.objects.dataStreams.*; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; import org.apache.logging.log4j.Logger; import java.io.*; -import java.util.ArrayList; import java.util.BitSet; /** diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java index 722515727..889b30726 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java @@ -1,18 +1,17 @@ -package com.seibel.lod.core.dataObjects.fullData.sources.interfaces; +package com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.IFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; -import com.seibel.lod.core.util.objects.dataStreams.DhDataOutputStream; -import com.seibel.lod.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.IFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; import java.io.IOException; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java similarity index 78% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java index 427236c42..fbc797f05 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.dataObjects.fullData.sources.interfaces; +package com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; public interface IIncompleteFullDataSource extends IFullDataSource { diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java index 491765ee2..92d9fc146 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java @@ -1,11 +1,13 @@ -package com.seibel.lod.core.dataObjects.fullData.sources.interfaces; +package com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; -import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.util.objects.dataStreams.*; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.FullDataArrayAccessor; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.core.util.objects.dataStreams.*; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderLoader.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderLoader.java index 561bb0813..f5d5da4f2 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderLoader.java @@ -1,16 +1,16 @@ -package com.seibel.lod.core.dataObjects.render; +package com.seibel.distanthorizons.core.dataObjects.render; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.transformers.FullDataToRenderDataTransformer; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.file.renderfile.RenderMetaDataFile; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.distanthorizons.core.file.renderfile.RenderMetaDataFile; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer; import org.apache.logging.log4j.Logger; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java index 62ee5395c..7a16f9b2d 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java @@ -1,31 +1,24 @@ -package com.seibel.lod.core.dataObjects.render; +package com.seibel.distanthorizons.core.dataObjects.render; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.render.bufferBuilding.ColumnRenderBufferBuilder; -import com.seibel.lod.core.dataObjects.transformers.FullDataToRenderDataTransformer; -import com.seibel.lod.core.util.objects.dataStreams.DhDataOutputStream; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnQuadView; -import com.seibel.lod.core.dataObjects.render.columnViews.IColumnDataView; -import com.seibel.lod.core.dataObjects.render.bufferBuilding.ColumnRenderBuffer; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.ColorUtil; -import com.seibel.lod.core.util.RenderDataPointUtil; -import com.seibel.lod.core.util.objects.Reference; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnQuadView; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.IColumnDataView; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.core.util.ColorUtil; +import com.seibel.distanthorizons.core.util.RenderDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; import org.apache.logging.log4j.Logger; import java.io.*; -import java.util.concurrent.CancellationException; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicReference; /** * Stores the render data used to generate OpenGL buffers. diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/BufferMergeDirectionEnum.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferMergeDirectionEnum.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/BufferMergeDirectionEnum.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferMergeDirectionEnum.java index c2898feba..9710448ee 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/BufferMergeDirectionEnum.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferMergeDirectionEnum.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; /** * EastWest
diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/BufferQuad.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/BufferQuad.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java index 5650011e3..3372c779a 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/BufferQuad.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.enums.ELodDirection; /** Represents a render-able quad. */ public final class BufferQuad @@ -34,7 +34,7 @@ public final class BufferQuad */ public static final int NORMAL_MAX_QUAD_WIDTH = 2048; /** The maximum number of blocks wide a quad can be - * when {@link com.seibel.lod.core.config.Config.Client.Graphics.AdvancedGraphics#earthCurveRatio earthCurveRatio} + * when {@link Config.Client.Graphics.AdvancedGraphics#earthCurveRatio earthCurveRatio} * is enabled. */ public static final int MAX_QUAD_WIDTH_FOR_EARTH_CURVATURE = LodUtil.CHUNK_WIDTH; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java index a7d08b8ad..c27c4cead 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java @@ -17,16 +17,16 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; -import com.seibel.lod.core.util.RenderDataPointUtil; -import com.seibel.lod.core.render.renderer.LodRenderer; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.util.ColorUtil; -import com.seibel.lod.coreapi.util.MathUtil; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.util.ColorUtil; +import com.seibel.distanthorizons.core.util.RenderDataPointUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; +import com.seibel.distanthorizons.core.render.renderer.LodRenderer; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.coreapi.util.MathUtil; public class ColumnBox { diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java index 3eed6c13c..6ba7cbfcf 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java @@ -1,19 +1,19 @@ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.render.renderer.DebugRenderer; -import com.seibel.lod.core.render.renderer.IDebugRenderable; -import com.seibel.lod.core.render.renderer.LodRenderer; -import com.seibel.lod.core.render.AbstractRenderBuffer; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; -import com.seibel.lod.core.util.*; -import com.seibel.lod.core.util.objects.StatsMap; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.render.AbstractRenderBuffer; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.render.renderer.DebugRenderer; +import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable; +import com.seibel.distanthorizons.core.render.renderer.LodRenderer; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.StatsMap; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.core.util.*; import org.apache.logging.log4j.Logger; import java.awt.*; @@ -21,8 +21,6 @@ import java.nio.ByteBuffer; import java.util.Iterator; import java.util.concurrent.*; -import static com.seibel.lod.core.render.glObject.GLProxy.GL_LOGGER; - /** * Java representation of one or more OpenGL buffers for rendering. * @@ -269,7 +267,7 @@ public class ColumnRenderBuffer extends AbstractRenderBuffer implements IDebugRe if (vertexBuffer.getSize() == 0) { - GL_LOGGER.warn("VBO with size 0"); + GLProxy.GL_LOGGER.warn("VBO with size 0"); } statsMap.incBytesStat("TotalUsage", vertexBuffer.getSize()); } diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java index 2c00037a9..b776c9d70 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java @@ -1,24 +1,24 @@ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.enums.rendering.EDebugRendering; -import com.seibel.lod.api.enums.rendering.EGLProxyContext; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.RenderDataPointUtil; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.util.objects.Reference; -import com.seibel.lod.core.util.objects.UncheckedInterruptedException; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; +import com.seibel.distanthorizons.api.enums.rendering.EGLProxyContext; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.RenderDataPointUtil; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.util.objects.Reference; +import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; +import com.seibel.distanthorizons.core.enums.ELodDirection; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java index c91d8e5d2..aa8ca2013 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java @@ -17,17 +17,17 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.util.RenderDataPointUtil; -import com.seibel.lod.api.enums.rendering.EDebugRendering; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.ColorUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.util.ColorUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.RenderDataPointUtil; +import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; /** * Builds LODs as rectangular prisms. diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java index fc675f6db..e2799975a 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java @@ -17,21 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dataObjects.render.bufferBuilding; +package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.*; -import com.seibel.lod.core.pos.Pos2D; -import com.seibel.lod.core.render.AbstractRenderBuffer; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.enums.ELodDirection.Axis; -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; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.render.AbstractRenderBuffer; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.util.ColorUtil; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.coreapi.util.MathUtil; import org.apache.logging.log4j.Logger; //TODO: Recheck this class for refactoring @@ -239,7 +238,7 @@ public class LodQuadBuilder int[][] quadBase = DIRECTION_VERTEX_IBO_QUAD[quad.direction.ordinal()]; short widthEastWest = quad.widthEastWest; short widthNorthSouth = quad.widthNorthSouthOrUpDown; - Axis axis = quad.direction.getAxis(); + ELodDirection.Axis axis = quad.direction.getAxis(); for (int i = 0; i < quadBase.length; i++) { short dx, dy, dz; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/ColumnArrayView.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/ColumnArrayView.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java index 7ec30d059..a4e391446 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/ColumnArrayView.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.dataObjects.render.columnViews; +package com.seibel.distanthorizons.core.dataObjects.render.columnViews; -import com.seibel.lod.core.util.RenderDataPointUtil; +import com.seibel.distanthorizons.core.util.RenderDataPointUtil; import java.util.Arrays; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/ColumnQuadView.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnQuadView.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/ColumnQuadView.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnQuadView.java index 1d839e796..659ed2bc8 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/ColumnQuadView.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnQuadView.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.dataObjects.render.columnViews; +package com.seibel.distanthorizons.core.dataObjects.render.columnViews; public class ColumnQuadView implements IColumnDataView { private final long[] data; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/IColumnDataView.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/IColumnDataView.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/IColumnDataView.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/IColumnDataView.java index 93dfca35f..19b2e079a 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/columnViews/IColumnDataView.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/IColumnDataView.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.dataObjects.render.columnViews; +package com.seibel.distanthorizons.core.dataObjects.render.columnViews; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/ChunkToLodBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/ChunkToLodBuilder.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/dataObjects/transformers/ChunkToLodBuilder.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/ChunkToLodBuilder.java index b9680e169..6ef86d61e 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/ChunkToLodBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/ChunkToLodBuilder.java @@ -1,19 +1,18 @@ -package com.seibel.lod.core.dataObjects.transformers; +package com.seibel.distanthorizons.core.dataObjects.transformers; -import java.io.Closeable; -import java.io.IOException; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.util.*; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.util.*; import org.apache.logging.log4j.LogManager; public class ChunkToLodBuilder implements AutoCloseable diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/DataRenderTransformer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java similarity index 78% rename from core/src/main/java/com/seibel/lod/core/dataObjects/transformers/DataRenderTransformer.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java index 6ae445e43..5b339d2a3 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/DataRenderTransformer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java @@ -1,15 +1,15 @@ -package com.seibel.lod.core.dataObjects.transformers; +package com.seibel.distanthorizons.core.dataObjects.transformers; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.render.ColumnRenderLoader; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderLoader; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullDataToRenderDataTransformer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullDataToRenderDataTransformer.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java index c3ddac932..2f142fb40 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullDataToRenderDataTransformer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java @@ -1,26 +1,26 @@ -package com.seibel.lod.core.dataObjects.transformers; +package com.seibel.distanthorizons.core.dataObjects.transformers; -import com.seibel.lod.api.enums.config.EBlocksToAvoid; -import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; -import com.seibel.lod.core.util.RenderDataPointUtil; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.api.enums.config.EBlocksToAvoid; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.RenderDataPointUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; /** * Handles converting {@link ChunkSizedFullDataAccessor}, {@link IIncompleteFullDataSource}, diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/LodBuilderConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodBuilderConfig.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/dataObjects/transformers/LodBuilderConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodBuilderConfig.java index fd399d0d8..d43b3b1a4 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/LodBuilderConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodBuilderConfig.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dataObjects.transformers; +package com.seibel.distanthorizons.core.dataObjects.transformers; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; /** * This is used to easily configure how LodChunks are generated. diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/LodDataBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodDataBuilder.java similarity index 82% rename from core/src/main/java/com/seibel/lod/core/dataObjects/transformers/LodDataBuilder.java rename to core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodDataBuilder.java index 640e2736c..db9d2c773 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/LodDataBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodDataBuilder.java @@ -1,13 +1,13 @@ -package com.seibel.lod.core.dataObjects.transformers; +package com.seibel.distanthorizons.core.dataObjects.transformers; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; import it.unimi.dsi.fastutil.longs.LongArrayList; public class LodDataBuilder { diff --git a/core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java b/core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/ModAccessorInjector.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java rename to core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/ModAccessorInjector.java index 12f125dd3..9dafd6523 100644 --- a/core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/ModAccessorInjector.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dependencyInjection; +package com.seibel.distanthorizons.core.dependencyInjection; -import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModAccessor; +import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor; import org.apache.logging.log4j.Logger; import java.lang.invoke.MethodHandles; diff --git a/core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java b/core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/SingletonInjector.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java rename to core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/SingletonInjector.java index 5c1391f88..67387cfdf 100644 --- a/core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/SingletonInjector.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.dependencyInjection; +package com.seibel.distanthorizons.core.dependencyInjection; -import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * This class takes care of dependency injection diff --git a/core/src/main/java/com/seibel/lod/core/enums/ELevelType.java b/core/src/main/java/com/seibel/distanthorizons/core/enums/ELevelType.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/enums/ELevelType.java rename to core/src/main/java/com/seibel/distanthorizons/core/enums/ELevelType.java index d1d212af0..b9acb0602 100644 --- a/core/src/main/java/com/seibel/lod/core/enums/ELevelType.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/enums/ELevelType.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.enums; +package com.seibel.distanthorizons.core.enums; /** * SERVER_LEVEL,
diff --git a/core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java b/core/src/main/java/com/seibel/distanthorizons/core/enums/ELodDirection.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java rename to core/src/main/java/com/seibel/distanthorizons/core/enums/ELodDirection.java index e01e0c752..4ffd93525 100644 --- a/core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/enums/ELodDirection.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.enums; +package com.seibel.distanthorizons.core.enums; import java.util.Arrays; import java.util.Locale; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.function.Predicate; import java.util.stream.Collectors; -import com.seibel.lod.coreapi.util.math.Vec3i; +import com.seibel.distanthorizons.coreapi.util.math.Vec3i; /** * An (almost) exact copy of Minecraft's diff --git a/core/src/main/java/com/seibel/lod/core/enums/worldGeneration/EWorldGenThreadMode.java b/core/src/main/java/com/seibel/distanthorizons/core/enums/worldGeneration/EWorldGenThreadMode.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/enums/worldGeneration/EWorldGenThreadMode.java rename to core/src/main/java/com/seibel/distanthorizons/core/enums/worldGeneration/EWorldGenThreadMode.java index f48363f31..8f5dfac3c 100644 --- a/core/src/main/java/com/seibel/lod/core/enums/worldGeneration/EWorldGenThreadMode.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/enums/worldGeneration/EWorldGenThreadMode.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.enums.worldGeneration; +package com.seibel.distanthorizons.core.enums.worldGeneration; /** * MULTI_THREADED,
diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java index d623c3e61..28c5c66cc 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java @@ -1,21 +1,23 @@ -package com.seibel.lod.core.file.fullDatafile; +package com.seibel.distanthorizons.core.file.fullDatafile; import com.google.common.collect.HashMultimap; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.*; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; -import com.seibel.lod.core.util.FileUtil; -import com.seibel.lod.core.file.metaData.BaseMetaData; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.distanthorizons.core.file.metaData.BaseMetaData; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.*; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.util.FileUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.ThreadUtil; import org.apache.logging.log4j.Logger; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java index 3b033d691..e490d5895 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataMetaFile.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.file.fullDatafile; +package com.seibel.distanthorizons.core.file.fullDatafile; import java.io.*; import java.lang.ref.*; @@ -9,18 +9,18 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantReadWriteLock; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.loader.AbstractFullDataSourceLoader; -import com.seibel.lod.core.file.metaData.BaseMetaData; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.file.metaData.AbstractMetaDataContainerFile; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.AtomicsUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.metaData.AbstractMetaDataContainerFile; +import com.seibel.distanthorizons.core.file.metaData.BaseMetaData; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.loader.AbstractFullDataSourceLoader; +import com.seibel.distanthorizons.core.util.AtomicsUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; import org.apache.logging.log4j.Logger; /** diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java index 126a6d36d..f33d90781 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java @@ -1,20 +1,19 @@ -package com.seibel.lod.core.file.fullDatafile; +package com.seibel.distanthorizons.core.file.fullDatafile; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; -import com.seibel.lod.core.file.metaData.BaseMetaData; -import com.seibel.lod.core.generation.tasks.IWorldGenTaskTracker; -import com.seibel.lod.core.generation.WorldGenerationQueue; -import com.seibel.lod.core.generation.tasks.WorldGenResult; -import com.seibel.lod.core.level.IDhServerLevel; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.distanthorizons.core.file.metaData.BaseMetaData; +import com.seibel.distanthorizons.core.generation.WorldGenerationQueue; +import com.seibel.distanthorizons.core.generation.tasks.IWorldGenTaskTracker; +import com.seibel.distanthorizons.core.generation.tasks.WorldGenResult; +import com.seibel.distanthorizons.core.level.IDhServerLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; +import com.seibel.distanthorizons.core.util.LodUtil; import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/IFullDataSourceProvider.java similarity index 78% rename from core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/IFullDataSourceProvider.java index 8443660cd..9e11e0bc5 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/IFullDataSourceProvider.java @@ -1,14 +1,13 @@ -package com.seibel.lod.core.file.fullDatafile; +package com.seibel.distanthorizons.core.file.fullDatafile; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.file.metaData.BaseMetaData; -import com.seibel.lod.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.file.metaData.BaseMetaData; +import com.seibel.distanthorizons.core.pos.DhSectionPos; import java.io.File; import java.util.Collection; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.function.Consumer; import java.util.function.Function; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/RemoteFullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/RemoteFullDataFileHandler.java similarity index 63% rename from core/src/main/java/com/seibel/lod/core/file/fullDatafile/RemoteFullDataFileHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/RemoteFullDataFileHandler.java index 6f6bf5ce0..394cf0050 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/RemoteFullDataFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/RemoteFullDataFileHandler.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.file.fullDatafile; +package com.seibel.distanthorizons.core.file.fullDatafile; -import com.seibel.lod.core.level.IDhLevel; +import com.seibel.distanthorizons.core.level.IDhLevel; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/metaData/AbstractMetaDataContainerFile.java b/core/src/main/java/com/seibel/distanthorizons/core/file/metaData/AbstractMetaDataContainerFile.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/file/metaData/AbstractMetaDataContainerFile.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/metaData/AbstractMetaDataContainerFile.java index dbee26bb8..910237066 100644 --- a/core/src/main/java/com/seibel/lod/core/file/metaData/AbstractMetaDataContainerFile.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/metaData/AbstractMetaDataContainerFile.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.file.metaData; +package com.seibel.distanthorizons.core.file.metaData; import java.io.*; import java.nio.ByteBuffer; @@ -12,12 +12,12 @@ import java.nio.file.StandardOpenOption; import java.util.zip.Adler32; import java.util.zip.CheckedOutputStream; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.util.FileUtil; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.dataStreams.DhDataOutputStream; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FileUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream; import org.apache.logging.log4j.Logger; /** diff --git a/core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java b/core/src/main/java/com/seibel/distanthorizons/core/file/metaData/BaseMetaData.java similarity index 75% rename from core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/metaData/BaseMetaData.java index 105d600f8..e70d814d9 100644 --- a/core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/metaData/BaseMetaData.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.file.metaData; +package com.seibel.distanthorizons.core.file.metaData; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; /** * Contains and represents the meta information ({@link DhSectionPos}, {@link BaseMetaData#dataLevel}, etc.) diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/ILodRenderSourceProvider.java similarity index 76% rename from core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/ILodRenderSourceProvider.java index 7373fa36b..6fda6d7b2 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/ILodRenderSourceProvider.java @@ -1,8 +1,8 @@ -package com.seibel.lod.core.file.renderfile; +package com.seibel.distanthorizons.core.file.renderfile; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; import java.io.File; import java.util.Collection; diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderMetaDataFile.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderMetaDataFile.java index 99af3c0dd..56bd88a42 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderMetaDataFile.java @@ -1,17 +1,17 @@ -package com.seibel.lod.core.file.renderfile; +package com.seibel.distanthorizons.core.file.renderfile; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.render.ColumnRenderLoader; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.file.metaData.BaseMetaData; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.file.metaData.AbstractMetaDataContainerFile; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.dataStreams.DhDataInputStream; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.file.metaData.AbstractMetaDataContainerFile; +import com.seibel.distanthorizons.core.file.metaData.BaseMetaData; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderLoader; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream; import org.apache.logging.log4j.Logger; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java index fccd6c0e2..e66cf5b20 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java @@ -1,19 +1,19 @@ -package com.seibel.lod.core.file.renderfile; +package com.seibel.distanthorizons.core.file.renderfile; import com.google.common.collect.HashMultimap; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.dataObjects.transformers.DataRenderTransformer; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.FileUtil; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.util.objects.UncheckedInterruptedException; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.dataObjects.transformers.DataRenderTransformer; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.util.FileUtil; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.util.LodUtil; import org.apache.logging.log4j.Logger; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/structure/AbstractSaveStructure.java b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/AbstractSaveStructure.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/file/structure/AbstractSaveStructure.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/structure/AbstractSaveStructure.java index 91ddc5cdd..b8231cf3b 100644 --- a/core/src/main/java/com/seibel/lod/core/file/structure/AbstractSaveStructure.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/AbstractSaveStructure.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.file.structure; +package com.seibel.distanthorizons.core.file.structure; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import org.apache.logging.log4j.Logger; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java index ef322f973..3186a54a5 100644 --- a/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java @@ -1,14 +1,14 @@ -package com.seibel.lod.core.file.structure; +package com.seibel.distanthorizons.core.file.structure; import com.google.common.net.PercentEscaper; -import com.seibel.lod.core.file.subDimMatching.SubDimensionLevelMatcher; -import com.seibel.lod.core.config.Config; -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; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.file.subDimMatching.SubDimensionLevelMatcher; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.api.enums.config.EServerFolderNameMode; +import com.seibel.distanthorizons.core.util.objects.ParsedIp; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import javax.annotation.Nullable; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/structure/LocalSaveStructure.java b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/file/structure/LocalSaveStructure.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java index 3510ba489..8f89d5d5c 100644 --- a/core/src/main/java/com/seibel/lod/core/file/structure/LocalSaveStructure.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.file.structure; +package com.seibel.distanthorizons.core.file.structure; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimCompare.java b/core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimCompare.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimCompare.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimCompare.java index 36d82bdb9..304257d17 100644 --- a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimCompare.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimCompare.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.file.subDimMatching; +package com.seibel.distanthorizons.core.file.subDimMatching; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.core.config.Config; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java b/core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionLevelMatcher.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionLevelMatcher.java index 95d94c92c..313dfc5c9 100644 --- a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionLevelMatcher.java @@ -1,26 +1,26 @@ -package com.seibel.lod.core.file.subDimMatching; +package com.seibel.distanthorizons.core.file.subDimMatching; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.util.FullDataPointUtil; -import com.seibel.lod.core.dataObjects.transformers.LodDataBuilder; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.file.fullDatafile.FullDataFileHandler; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.structure.ClientOnlySaveStructure; -import com.seibel.lod.core.level.DhClientLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataFileHandler; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure; +import com.seibel.distanthorizons.core.level.DhClientLevel; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.FullDataPointUtil; +import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import org.apache.logging.log4j.LogManager; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionPlayerData.java b/core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionPlayerData.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionPlayerData.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionPlayerData.java index b67c660e3..efe6f9856 100644 --- a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionPlayerData.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionPlayerData.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.file.subDimMatching; +package com.seibel.distanthorizons.core.file.subDimMatching; import com.electronwill.nightconfig.core.file.CommentedFileConfig; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import javax.annotation.Nullable; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java similarity index 81% rename from core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java index 36648639e..3597b65d9 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java @@ -17,22 +17,22 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.generation; +package com.seibel.distanthorizons.core.generation; -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.coreapi.interfaces.dependencyInjection.IOverrideInjector; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IOverrideInjector; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java index 08e6561a0..89a9e2b35 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java @@ -1,25 +1,30 @@ -package com.seibel.lod.core.generation; +package com.seibel.distanthorizons.core.generation; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.transformers.LodDataBuilder; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.file.fullDatafile.FullDataFileHandler; -import com.seibel.lod.core.generation.tasks.*; -import com.seibel.lod.core.pos.*; -import com.seibel.lod.core.render.renderer.DebugRenderer; -import com.seibel.lod.core.render.renderer.IDebugRenderable; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; -import com.seibel.lod.core.util.objects.quadTree.QuadTree; -import com.seibel.lod.core.util.objects.UncheckedInterruptedException; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.generation.tasks.*; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder; +import com.seibel.distanthorizons.core.file.fullDatafile.FullDataFileHandler; +import com.seibel.distanthorizons.core.generation.tasks.*; +import com.seibel.distanthorizons.core.pos.*; +import com.seibel.distanthorizons.core.render.renderer.DebugRenderer; +import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadTree; +import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import org.apache.logging.log4j.Logger; import java.awt.*; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/IWorldGenTaskTracker.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/IWorldGenTaskTracker.java similarity index 65% rename from core/src/main/java/com/seibel/lod/core/generation/tasks/IWorldGenTaskTracker.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/IWorldGenTaskTracker.java index 52a52713d..d8704cc83 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/IWorldGenTaskTracker.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/IWorldGenTaskTracker.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.generation.tasks; +package com.seibel.distanthorizons.core.generation.tasks; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import java.util.function.Consumer; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/InProgressWorldGenTaskGroup.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/InProgressWorldGenTaskGroup.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/generation/tasks/InProgressWorldGenTaskGroup.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/InProgressWorldGenTaskGroup.java index 1c8bd2024..ee8e70cc5 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/InProgressWorldGenTaskGroup.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/InProgressWorldGenTaskGroup.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.generation.tasks; +package com.seibel.distanthorizons.core.generation.tasks; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenResult.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenResult.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenResult.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenResult.java index f6bb45be7..ab69b8fec 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenResult.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenResult.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.generation.tasks; +package com.seibel.distanthorizons.core.generation.tasks; -import com.seibel.lod.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; import java.util.Collection; import java.util.LinkedList; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTask.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTask.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java index 4e33f5b90..c0f4b03b6 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTask.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTask.java @@ -1,8 +1,7 @@ -package com.seibel.lod.core.generation.tasks; +package com.seibel.distanthorizons.core.generation.tasks; -import com.seibel.lod.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhLodPos; -import java.util.LinkedList; import java.util.concurrent.CompletableFuture; /** diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTaskGroup.java similarity index 82% rename from core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java rename to core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTaskGroup.java index d9666902d..6fff92cde 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/tasks/WorldGenTaskGroup.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.generation.tasks; +package com.seibel.distanthorizons.core.generation.tasks; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.pos.DhLodPos; import java.util.Iterator; import java.util.LinkedList; diff --git a/core/src/main/java/com/seibel/lod/core/jar/DarkModeDetector.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/DarkModeDetector.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/jar/DarkModeDetector.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/DarkModeDetector.java index d7ba37c84..25e3eea91 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/DarkModeDetector.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/DarkModeDetector.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar; +package com.seibel.distanthorizons.core.jar; import java.io.*; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/jar/JarDependencySetup.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/JarDependencySetup.java new file mode 100644 index 000000000..fc4172b98 --- /dev/null +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/JarDependencySetup.java @@ -0,0 +1,12 @@ +package com.seibel.distanthorizons.core.jar; + +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.jar.wrapperInterfaces.config.LangWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; + +public class JarDependencySetup { + public static void createInitialBindings() { + SingletonInjector.INSTANCE.bind(ILangWrapper.class, LangWrapper.INSTANCE); + LangWrapper.init(); + } +} diff --git a/core/src/main/java/com/seibel/lod/core/jar/JarMain.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/JarMain.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/jar/JarMain.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/JarMain.java index cb15f82b8..f96ac1147 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/JarMain.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/JarMain.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.jar; +package com.seibel.distanthorizons.core.jar; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.jar.gui.BaseJFrame; -import com.seibel.lod.core.jar.gui.cusomJObject.JBox; -import com.seibel.lod.core.jar.installer.ModrinthGetter; -import com.seibel.lod.core.jar.installer.WebDownloader; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.jar.gui.BaseJFrame; +import com.seibel.distanthorizons.core.jar.gui.cusomJObject.JBox; +import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; +import com.seibel.distanthorizons.core.jar.installer.WebDownloader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; diff --git a/core/src/main/java/com/seibel/lod/core/jar/JarUtils.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/JarUtils.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/jar/JarUtils.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/JarUtils.java index 47b47260f..b22095187 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/JarUtils.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/JarUtils.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar; +package com.seibel.distanthorizons.core.jar; import java.io.*; import java.net.URI; diff --git a/core/src/main/java/com/seibel/lod/core/jar/Platform.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/Platform.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/jar/Platform.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/Platform.java index 28709d379..d83a80b81 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/Platform.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/Platform.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar; +package com.seibel.distanthorizons.core.jar; /** * A simple OS getting util based off LWJGL's Platform at org.lwjgl.system.Platform.
diff --git a/core/src/main/java/com/seibel/lod/core/jar/gui/BaseJFrame.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/jar/gui/BaseJFrame.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java index f9d43f671..546e860ab 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/gui/BaseJFrame.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.jar.gui; +package com.seibel.distanthorizons.core.jar.gui; import com.formdev.flatlaf.FlatDarkLaf; import com.formdev.flatlaf.FlatLightLaf; import com.formdev.flatlaf.extras.FlatSVGIcon; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.jar.JarUtils; -import com.seibel.lod.core.wrapperInterfaces.config.ILangWrapper; +import com.seibel.distanthorizons.core.jar.JarUtils; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; import javax.imageio.ImageIO; import javax.swing.*; diff --git a/core/src/main/java/com/seibel/lod/core/jar/gui/JSwitch.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitch.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/jar/gui/JSwitch.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitch.java index 95f9eb9e6..8fb7c4fb7 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/gui/JSwitch.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitch.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar.gui; +package com.seibel.distanthorizons.core.jar.gui; import java.awt.*; import java.awt.event.MouseAdapter; diff --git a/core/src/main/java/com/seibel/lod/core/jar/gui/JSwitchBox.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitchBox.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/jar/gui/JSwitchBox.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitchBox.java index c011cfdfc..75a077356 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/gui/JSwitchBox.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitchBox.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar.gui; +package com.seibel.distanthorizons.core.jar.gui; import java.awt.Color; import java.awt.Dimension; diff --git a/core/src/main/java/com/seibel/lod/core/jar/gui/cusomJObject/JBox.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/cusomJObject/JBox.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/jar/gui/cusomJObject/JBox.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/gui/cusomJObject/JBox.java index 6ae1d0c7a..ffcf9eaa7 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/gui/cusomJObject/JBox.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/cusomJObject/JBox.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar.gui.cusomJObject; +package com.seibel.distanthorizons.core.jar.gui.cusomJObject; import javax.swing.*; import java.awt.*; diff --git a/core/src/main/java/com/seibel/lod/core/jar/installer/GitlabGetter.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/GitlabGetter.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/jar/installer/GitlabGetter.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/installer/GitlabGetter.java index d521df754..7f12e75d7 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/installer/GitlabGetter.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/GitlabGetter.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar.installer; +package com.seibel.distanthorizons.core.jar.installer; import java.net.URL; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/jar/installer/MarkdownFormatter.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/MarkdownFormatter.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/jar/installer/MarkdownFormatter.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/installer/MarkdownFormatter.java index ab07e0967..581ffa836 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/installer/MarkdownFormatter.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/MarkdownFormatter.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar.installer; +package com.seibel.distanthorizons.core.jar.installer; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/com/seibel/lod/core/jar/installer/ModrinthGetter.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/ModrinthGetter.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/jar/installer/ModrinthGetter.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/installer/ModrinthGetter.java index 0801690da..097ae6f8b 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/installer/ModrinthGetter.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/ModrinthGetter.java @@ -1,7 +1,6 @@ -package com.seibel.lod.core.jar.installer; +package com.seibel.distanthorizons.core.jar.installer; import com.electronwill.nightconfig.core.Config; -import com.electronwill.nightconfig.core.io.ParsingMode; import com.electronwill.nightconfig.json.JsonFormat; import java.net.URL; diff --git a/core/src/main/java/com/seibel/lod/core/jar/installer/WebDownloader.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/WebDownloader.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/jar/installer/WebDownloader.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/installer/WebDownloader.java index cf160b5e2..4a561ce84 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/installer/WebDownloader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/installer/WebDownloader.java @@ -1,8 +1,7 @@ -package com.seibel.lod.core.jar.installer; +package com.seibel.distanthorizons.core.jar.installer; import javax.net.ssl.HttpsURLConnection; import java.io.*; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.security.DigestInputStream; diff --git a/core/src/main/java/com/seibel/lod/core/jar/tui/BaseTUI.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/tui/BaseTUI.java similarity index 55% rename from core/src/main/java/com/seibel/lod/core/jar/tui/BaseTUI.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/tui/BaseTUI.java index 8421f121a..8dff949dd 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/tui/BaseTUI.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/tui/BaseTUI.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.jar.tui; +package com.seibel.distanthorizons.core.jar.tui; // TUI stands for terminal ui btw public class BaseTUI { diff --git a/core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/updater/SelfUpdater.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/updater/SelfUpdater.java index 38bda1e1b..54fa9a906 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/updater/SelfUpdater.java @@ -1,13 +1,13 @@ -package com.seibel.lod.core.jar.updater; +package com.seibel.distanthorizons.core.jar.updater; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.jar.JarUtils; -import com.seibel.lod.core.jar.installer.ModrinthGetter; -import com.seibel.lod.core.jar.installer.WebDownloader; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.core.jar.JarUtils; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; +import com.seibel.distanthorizons.core.jar.installer.WebDownloader; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import org.apache.logging.log4j.Logger; import java.nio.file.Files; diff --git a/core/src/main/java/com/seibel/lod/core/jar/wrapperInterfaces/config/LangWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/wrapperInterfaces/config/LangWrapper.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/jar/wrapperInterfaces/config/LangWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/jar/wrapperInterfaces/config/LangWrapper.java index eb59306fc..15e70d2ab 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/wrapperInterfaces/config/LangWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/wrapperInterfaces/config/LangWrapper.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.jar.wrapperInterfaces.config; +package com.seibel.distanthorizons.core.jar.wrapperInterfaces.config; import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.io.ParsingMode; import com.electronwill.nightconfig.json.JsonFormat; -import com.seibel.lod.core.jar.JarUtils; -import com.seibel.lod.core.wrapperInterfaces.config.ILangWrapper; +import com.seibel.distanthorizons.core.jar.JarUtils; +import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/level/ClientLevelModule.java b/core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/level/ClientLevelModule.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java index 3b1fb7233..cb330f4d2 100644 --- a/core/src/main/java/com/seibel/lod/core/level/ClientLevelModule.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/ClientLevelModule.java @@ -1,26 +1,26 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.renderfile.RenderSourceFileHandler; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.logging.f3.F3Screen; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.render.LodQuadTree; -import com.seibel.lod.core.render.RenderBufferHandler; -import com.seibel.lod.core.render.renderer.LodRenderer; -import com.seibel.lod.core.util.FileScanUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.renderfile.RenderSourceFileHandler; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.logging.f3.F3Screen; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.render.LodQuadTree; +import com.seibel.distanthorizons.core.render.RenderBufferHandler; +import com.seibel.distanthorizons.core.render.renderer.LodRenderer; +import com.seibel.distanthorizons.core.util.FileScanUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/level/DhClientLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java similarity index 74% rename from core/src/main/java/com/seibel/lod/core/level/DhClientLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java index 7cb05a6cc..bf21a7b0c 100644 --- a/core/src/main/java/com/seibel/lod/core/level/DhClientLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java @@ -1,17 +1,17 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.fullDatafile.RemoteFullDataFileHandler; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.fullDatafile.RemoteFullDataFileHandler; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java similarity index 76% rename from core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java index c02f2bc96..f998ccfe3 100644 --- a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java @@ -1,21 +1,21 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/level/DhLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhLevel.java similarity index 62% rename from core/src/main/java/com/seibel/lod/core/level/DhLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/DhLevel.java index 6078bf46f..0811d7f14 100644 --- a/core/src/main/java/com/seibel/lod/core/level/DhLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhLevel.java @@ -1,11 +1,8 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.transformers.ChunkToLodBuilder; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.transformers.ChunkToLodBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/level/DhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java similarity index 71% rename from core/src/main/java/com/seibel/lod/core/level/DhServerLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java index 028d6c31b..b8f0e6838 100644 --- a/core/src/main/java/com/seibel/lod/core/level/DhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java @@ -1,19 +1,15 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.FileScanUtil; -import com.seibel.lod.core.file.fullDatafile.FullDataFileHandler; -import com.seibel.lod.core.file.structure.LocalSaveStructure; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/IDhClientLevel.java similarity index 51% rename from core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/IDhClientLevel.java index d795bf4ac..3a55bd252 100644 --- a/core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/IDhClientLevel.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; public interface IDhClientLevel extends IDhLevel { diff --git a/core/src/main/java/com/seibel/lod/core/level/IDhLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/IDhLevel.java similarity index 56% rename from core/src/main/java/com/seibel/lod/core/level/IDhLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/IDhLevel.java index dac338d66..dd980e252 100644 --- a/core/src/main/java/com/seibel/lod/core/level/IDhLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/IDhLevel.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/level/IDhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/IDhServerLevel.java similarity index 50% rename from core/src/main/java/com/seibel/lod/core/level/IDhServerLevel.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/IDhServerLevel.java index 62b288a82..8ebb43017 100644 --- a/core/src/main/java/com/seibel/lod/core/level/IDhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/IDhServerLevel.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.core.file.fullDatafile.GeneratedFullDataFileHandler; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataFileHandler; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; public interface IDhServerLevel extends IDhLevel, GeneratedFullDataFileHandler.IOnWorldGenCompleteListener { diff --git a/core/src/main/java/com/seibel/lod/core/level/ServerLevelModule.java b/core/src/main/java/com/seibel/distanthorizons/core/level/ServerLevelModule.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/level/ServerLevelModule.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/ServerLevelModule.java index 2a5d64112..17f2f7de9 100644 --- a/core/src/main/java/com/seibel/lod/core/level/ServerLevelModule.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/ServerLevelModule.java @@ -1,17 +1,17 @@ -package com.seibel.lod.core.level; +package com.seibel.distanthorizons.core.level; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.core.config.AppliedConfigState; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.file.fullDatafile.GeneratedFullDataFileHandler; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.generation.BatchGenerator; -import com.seibel.lod.core.generation.WorldGenerationQueue; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.util.FileScanUtil; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; -import com.seibel.lod.coreapi.DependencyInjection.WorldGeneratorInjector; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.core.config.AppliedConfigState; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataFileHandler; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.generation.BatchGenerator; +import com.seibel.distanthorizons.core.generation.WorldGenerationQueue; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.util.FileScanUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.coreapi.DependencyInjection.WorldGeneratorInjector; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java b/core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedLogger.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java rename to core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedLogger.java index 90af51168..8f52f8572 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedLogger.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedLogger.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.logging; +package com.seibel.distanthorizons.core.logging; -import com.seibel.lod.api.enums.config.ELoggerMode; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.api.enums.config.ELoggerMode; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.Message; diff --git a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java b/core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedSpamLogger.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java rename to core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedSpamLogger.java index 3dcf748ca..338033320 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/ConfigBasedSpamLogger.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedSpamLogger.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.logging; +package com.seibel.distanthorizons.core.logging; -import com.seibel.lod.api.enums.config.ELoggerMode; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.api.enums.config.ELoggerMode; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.Message; diff --git a/core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/logging/DhLoggerBuilder.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java rename to core/src/main/java/com/seibel/distanthorizons/core/logging/DhLoggerBuilder.java index 49e384373..83a60d8ae 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/logging/DhLoggerBuilder.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.logging; +package com.seibel.distanthorizons.core.logging; -import com.seibel.lod.coreapi.ModInfo; +import com.seibel.distanthorizons.coreapi.ModInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java b/core/src/main/java/com/seibel/distanthorizons/core/logging/SpamReducedLogger.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java rename to core/src/main/java/com/seibel/distanthorizons/core/logging/SpamReducedLogger.java index ccf9e49da..060a4c4f9 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/logging/SpamReducedLogger.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.logging; +package com.seibel.distanthorizons.core.logging; import java.lang.invoke.MethodHandles; import java.lang.ref.WeakReference; diff --git a/core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java b/core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java rename to core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java index 1879fb33e..f17d99f72 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java @@ -1,9 +1,8 @@ -package com.seibel.lod.core.logging.f3; +package com.seibel.distanthorizons.core.logging.f3; -import com.seibel.lod.coreapi.ModInfo; +import com.seibel.distanthorizons.coreapi.ModInfo; import java.io.Closeable; -import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhBlockPos.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/pos/DhBlockPos.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/DhBlockPos.java index 206dd7523..7ee18e412 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhBlockPos.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; import java.util.Objects; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhBlockPos2D.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/DhBlockPos2D.java index 6b085bc18..7cd3efdda 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhBlockPos2D.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; public class DhBlockPos2D { public static final DhBlockPos2D ZERO = new DhBlockPos2D(0, 0); diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhChunkPos.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhChunkPos.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/pos/DhChunkPos.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/DhChunkPos.java index 0146f32d7..50565073b 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhChunkPos.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhChunkPos.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; import java.util.Objects; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhLodPos.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/DhLodPos.java index 83e8e3ea4..dce4d5060 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhLodPos.java @@ -1,8 +1,8 @@ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; -import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.core.util.LodUtil; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhLodUnit.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/DhLodUnit.java index efb906d24..b47d94186 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhLodUnit.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; -import com.seibel.lod.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; /** * Often used to measure LOD widths diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhSectionPos.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/DhSectionPos.java index b81f37b4e..dae62d9d9 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/DhSectionPos.java @@ -1,8 +1,8 @@ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.core.util.LodUtil; import java.util.function.Consumer; diff --git a/core/src/main/java/com/seibel/lod/core/pos/Pos2D.java b/core/src/main/java/com/seibel/distanthorizons/core/pos/Pos2D.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/pos/Pos2D.java rename to core/src/main/java/com/seibel/distanthorizons/core/pos/Pos2D.java index 77a2a18ca..369107829 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/Pos2D.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/pos/Pos2D.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.pos; +package com.seibel.distanthorizons.core.pos; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; import java.util.Objects; diff --git a/core/src/main/java/com/seibel/lod/core/render/AbstractRenderBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/AbstractRenderBuffer.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/render/AbstractRenderBuffer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/AbstractRenderBuffer.java index b6ee44d0d..a96f22cfd 100644 --- a/core/src/main/java/com/seibel/lod/core/render/AbstractRenderBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/AbstractRenderBuffer.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render; +package com.seibel.distanthorizons.core.render; -import com.seibel.lod.core.render.renderer.LodRenderer; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.StatsMap; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.StatsMap; +import com.seibel.distanthorizons.core.render.renderer.LodRenderer; public abstract class AbstractRenderBuffer implements AutoCloseable { diff --git a/core/src/main/java/com/seibel/lod/core/render/DhApiRenderProxy.java b/core/src/main/java/com/seibel/distanthorizons/core/render/DhApiRenderProxy.java similarity index 67% rename from core/src/main/java/com/seibel/lod/core/render/DhApiRenderProxy.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/DhApiRenderProxy.java index 18b922aa0..5369f2645 100644 --- a/core/src/main/java/com/seibel/lod/core/render/DhApiRenderProxy.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/DhApiRenderProxy.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.render; +package com.seibel.distanthorizons.core.render; -import com.seibel.lod.api.interfaces.render.IDhApiRenderProxy; -import com.seibel.lod.api.objects.DhApiResult; -import com.seibel.lod.core.api.internal.SharedApi; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.world.AbstractDhWorld; +import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy; +import com.seibel.distanthorizons.api.objects.DhApiResult; +import com.seibel.distanthorizons.core.api.internal.SharedApi; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.world.AbstractDhWorld; /** * Used to interact with Distant Horizons' rendering systems. diff --git a/core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java index 0b64eb085..4983cac60 100644 --- a/core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java @@ -1,18 +1,18 @@ -package com.seibel.lod.core.render; +package com.seibel.distanthorizons.core.render; -import com.seibel.lod.api.enums.config.EHorizontalQuality; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.listeners.ConfigChangeListener; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; -import com.seibel.lod.core.util.objects.quadTree.QuadTree; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.api.enums.config.EHorizontalQuality; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.file.renderfile.ILodRenderSourceProvider; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadTree; +import com.seibel.distanthorizons.coreapi.util.MathUtil; import org.apache.logging.log4j.Logger; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java index e141836ad..754a5c4d5 100644 --- a/core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java @@ -1,18 +1,18 @@ -package com.seibel.lod.core.render; +package com.seibel.distanthorizons.core.render; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.dataObjects.render.bufferBuilding.ColumnRenderBuffer; -import com.seibel.lod.core.dataObjects.render.bufferBuilding.ColumnRenderBufferBuilder; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider; -import com.seibel.lod.core.render.renderer.DebugRenderer; -import com.seibel.lod.core.render.renderer.IDebugRenderable; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.Reference; -import com.seibel.lod.core.util.objects.quadTree.QuadTree; +import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; +import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.ColumnRenderBufferBuilder; +import com.seibel.distanthorizons.core.file.renderfile.ILodRenderSourceProvider; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.Reference; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadTree; +import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.ColumnRenderBuffer; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.core.render.renderer.DebugRenderer; import org.apache.logging.log4j.Logger; import java.awt.*; @@ -20,7 +20,6 @@ import java.util.Objects; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; -import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; /** diff --git a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/render/RenderBufferHandler.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/RenderBufferHandler.java index 411e873cb..c7290243f 100644 --- a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/RenderBufferHandler.java @@ -1,14 +1,13 @@ -package com.seibel.lod.core.render; +package com.seibel.distanthorizons.core.render; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.Pos2D; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.render.renderer.LodRenderer; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.core.util.objects.SortedArraySet; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.util.objects.SortedArraySet; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.core.render.renderer.LodRenderer; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; import org.apache.logging.log4j.Logger; import java.util.Comparator; diff --git a/core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java b/core/src/main/java/com/seibel/distanthorizons/core/render/fog/FogSettings.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/fog/FogSettings.java index 9f4f13c9f..a5051dae6 100644 --- a/core/src/main/java/com/seibel/lod/core/render/fog/FogSettings.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/fog/FogSettings.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.fog; +package com.seibel.distanthorizons.core.render.fog; -import com.seibel.lod.api.enums.rendering.EFogFalloff; +import com.seibel.distanthorizons.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/distanthorizons/core/render/fog/LodFogConfig.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/render/fog/LodFogConfig.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/fog/LodFogConfig.java index f30ec2dc4..4d44bc0ba 100644 --- a/core/src/main/java/com/seibel/lod/core/render/fog/LodFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/fog/LodFogConfig.java @@ -17,21 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.fog; +package com.seibel.distanthorizons.core.render.fog; -import com.seibel.lod.api.enums.rendering.*; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.render.glObject.shader.Shader; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; +import com.seibel.distanthorizons.api.enums.rendering.*; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.shader.Shader; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import java.io.FileOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Objects; -import static com.seibel.lod.core.render.glObject.GLProxy.GL_LOGGER; - /** * This holds fog related settings and * creates the fog related shader code. @@ -171,11 +170,11 @@ public class LodFogConfig try (FileOutputStream file = new FileOutputStream("debugGenerated.frag", false)) { file.write(str.toString().getBytes(StandardCharsets.UTF_8)); - GL_LOGGER.info("Debug dumped generated code to debugGenerated.frag for {}", path); + GLProxy.GL_LOGGER.info("Debug dumped generated code to debugGenerated.frag for {}", path); } catch (IOException e) { - GL_LOGGER.warn("Failed to debug dump generated code to file for {}", path); + GLProxy.GL_LOGGER.warn("Failed to debug dump generated code to file for {}", path); } } return str; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/GLEnums.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLEnums.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/render/glObject/GLEnums.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLEnums.java index 6768dfd80..92f6fd46e 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/GLEnums.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLEnums.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject; +package com.seibel.distanthorizons.core.render.glObject; import static org.lwjgl.opengl.GL46.*; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java index e876050ef..9794a1d9f 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject; +package com.seibel.distanthorizons.core.render.glObject; import java.io.PrintStream; import java.lang.invoke.MethodHandles; @@ -25,11 +25,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.glfw.GLFW; @@ -40,13 +39,12 @@ import org.lwjgl.opengl.GLCapabilities; import org.lwjgl.opengl.GLUtil; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.seibel.lod.coreapi.ModInfo; -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; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.enums.rendering.EGLProxyContext; +import com.seibel.distanthorizons.core.util.objects.GLMessage; +import com.seibel.distanthorizons.core.util.objects.GLMessageOutputStream; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; /** * A singleton that holds references to different openGL contexts diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/GLState.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLState.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/render/glObject/GLState.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLState.java index 5d11f96c6..f24f91f61 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/GLState.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLState.java @@ -17,9 +17,8 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject; +package com.seibel.distanthorizons.core.render.glObject; -import com.seibel.lod.core.render.glObject.GLEnums; import org.lwjgl.opengl.GL32; public class GLState { diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/LightmapTexture.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/LightmapTexture.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/render/glObject/LightmapTexture.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/LightmapTexture.java index ce73e3f35..61f45c79b 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/LightmapTexture.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/LightmapTexture.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject; +package com.seibel.distanthorizons.core.render.glObject; import org.lwjgl.opengl.GL32; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java index a57b214b6..0b905a06f 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.render.glObject.buffer; +package com.seibel.distanthorizons.core.render.glObject.buffer; -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; -import com.seibel.lod.core.util.math.UnitBytes; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.enums.rendering.EGLProxyContext; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.math.UnitBytes; import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL44; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLElementBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLElementBuffer.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLElementBuffer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLElementBuffer.java index ff64a083a..e50b6cf48 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLElementBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLElementBuffer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.buffer; +package com.seibel.distanthorizons.core.render.glObject.buffer; import org.lwjgl.opengl.GL32; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLVertexBuffer.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLVertexBuffer.java index c913ca4a6..3516fe8be 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/GLVertexBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLVertexBuffer.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.buffer; +package com.seibel.distanthorizons.core.render.glObject.buffer; import java.nio.ByteBuffer; import org.lwjgl.opengl.GL32; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.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/distanthorizons/core/render/glObject/buffer/QuadElementBuffer.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/render/glObject/buffer/QuadElementBuffer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/QuadElementBuffer.java index 5448ad99c..75c6cd3f1 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/buffer/QuadElementBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/QuadElementBuffer.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.render.glObject.buffer; +package com.seibel.distanthorizons.core.render.glObject.buffer; -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; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.render.glObject.GLEnums; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL32; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/shader/Shader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/Shader.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/render/glObject/shader/Shader.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/Shader.java index ef4cfc8a5..b14a9cf03 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/shader/Shader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/Shader.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.shader; +package com.seibel.distanthorizons.core.render.glObject.shader; import java.io.BufferedReader; import java.io.FileInputStream; @@ -26,10 +26,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; import org.lwjgl.opengl.GL32; -import static com.seibel.lod.core.render.glObject.GLProxy.GL_LOGGER; - /** * This object holds a OpenGL reference to a shader * and allows for reading in and compiling a shader file. @@ -50,7 +49,7 @@ public class Shader */ public Shader(int type, String path, boolean absoluteFilePath) { - GL_LOGGER.info("Loading shader at "+path); + GLProxy.GL_LOGGER.info("Loading shader at "+path); // Create an empty shader object id = GL32.glCreateShader(type); StringBuilder source = loadFile(path, absoluteFilePath, new StringBuilder()); @@ -64,13 +63,13 @@ public class Shader free(); // important! throw new RuntimeException(message); } - GL_LOGGER.info("Shader at "+path+" loaded sucessfully."); + GLProxy.GL_LOGGER.info("Shader at "+path+" loaded sucessfully."); } public Shader(int type, String sourceString) { - GL_LOGGER.info("Loading shader with type: {}", type); - GL_LOGGER.debug("Source:\n{}", sourceString); + GLProxy.GL_LOGGER.info("Loading shader with type: {}", type); + GLProxy.GL_LOGGER.debug("Source:\n{}", sourceString); // Create an empty shader object id = GL32.glCreateShader(type); GL32.glShaderSource(id, sourceString); @@ -85,7 +84,7 @@ public class Shader free(); // important! throw new RuntimeException(message); } - GL_LOGGER.info("Shader loaded sucessfully."); + GLProxy.GL_LOGGER.info("Shader loaded sucessfully."); } // REMEMBER to always free the resource! diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/ShaderProgram.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/ShaderProgram.java index b683a9704..3e05ff439 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/ShaderProgram.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.shader; +package com.seibel.distanthorizons.core.render.glObject.shader; import java.awt.Color; import java.nio.FloatBuffer; @@ -29,9 +29,9 @@ import java.util.function.Supplier; import org.lwjgl.opengl.GL32; import org.lwjgl.system.MemoryStack; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3d; -import com.seibel.lod.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3d; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; /** diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttribute.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttribute.java index ea5d24b76..a0764e27c 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttribute.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.vertexAttribute; +package com.seibel.distanthorizons.core.render.glObject.vertexAttribute; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.coreapi.util.MathUtil; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.coreapi.util.MathUtil; import org.lwjgl.opengl.GL32; public abstract class VertexAttribute { diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttributePostGL43.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttributePostGL43.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttributePostGL43.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttributePostGL43.java index 45023fd97..8e7c3b4d0 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttributePostGL43.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttributePostGL43.java @@ -17,12 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.vertexAttribute; +package com.seibel.distanthorizons.core.render.glObject.vertexAttribute; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; import org.lwjgl.opengl.GL43; -import static com.seibel.lod.core.render.glObject.GLProxy.GL_LOGGER; - // In OpenGL 4.3 and later, Vertex Attribute got a make-over. // Now it provides support for buffer binding points natively. // This means that setting up the VAO just use ONE native call when @@ -85,11 +84,11 @@ public final class VertexAttributePostGL43 extends VertexAttribute { // Requires VertexAttribute binded public void completeAndCheck(int expectedStrideSize) { if (strideSize != expectedStrideSize) { - GL_LOGGER.error("Vertex Attribute calculated stride size " + strideSize + + GLProxy.GL_LOGGER.error("Vertex Attribute calculated stride size " + strideSize + " does not match the provided expected stride size " + expectedStrideSize + "!"); throw new IllegalArgumentException("Vertex Attribute Incorrect Format"); } - GL_LOGGER.info("Vertex Attribute (GL43+) completed. It contains "+numberOfBindingPoints + GLProxy.GL_LOGGER.info("Vertex Attribute (GL43+) completed. It contains "+numberOfBindingPoints +" binding points and a stride size of "+strideSize); } diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttributePreGL43.java b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttributePreGL43.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttributePreGL43.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttributePreGL43.java index 119d373c0..460a027c8 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttributePreGL43.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexAttributePreGL43.java @@ -17,17 +17,16 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.glObject.vertexAttribute; +package com.seibel.distanthorizons.core.render.glObject.vertexAttribute; import java.util.ArrayList; import java.util.Iterator; import java.util.TreeMap; import java.util.TreeSet; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; import org.lwjgl.opengl.GL32; -import static com.seibel.lod.core.render.glObject.GLProxy.GL_LOGGER; - public final class VertexAttributePreGL43 extends VertexAttribute { @@ -140,30 +139,30 @@ public final class VertexAttributePreGL43 extends VertexAttribute { for (int i = 0; i < pointers.length; i++) { VertexPointer pointer = pointers[i]; if (pointer == null) { - GL_LOGGER.warn("Vertex Attribute index "+i+" is not set! No index should be skipped normally!"); + GLProxy.GL_LOGGER.warn("Vertex Attribute index "+i+" is not set! No index should be skipped normally!"); continue; } pointersOffset[i] = currentOffset; currentOffset += pointer.byteSize; } if (currentOffset != expectedStrideSize) { - GL_LOGGER.error("Vertex Attribute calculated stride size " + currentOffset + + GLProxy.GL_LOGGER.error("Vertex Attribute calculated stride size " + currentOffset + " does not match the provided expected stride size " + expectedStrideSize + "!"); throw new IllegalArgumentException("Vertex Attribute Incorrect Format"); } strideSize = currentOffset; - GL_LOGGER.info("Vertex Attribute (pre GL43) completed."); + GLProxy.GL_LOGGER.info("Vertex Attribute (pre GL43) completed."); // Debug logging - GL_LOGGER.debug("AttributeIndex: ElementCount, glType, normalized, strideSize, offset"); + GLProxy.GL_LOGGER.debug("AttributeIndex: ElementCount, glType, normalized, strideSize, offset"); for (int i=0; i< pointers.length; i++) { VertexPointer pointer = pointers[i]; if (pointer==null) { - GL_LOGGER.debug(i + ": Null!!!!"); + GLProxy.GL_LOGGER.debug(i + ": Null!!!!"); continue; } - GL_LOGGER.debug(i + ": "+pointer.elementCount+", "+ + GLProxy.GL_LOGGER.debug(i + ": "+pointer.elementCount+", "+ pointer.glType+", "+pointer.normalized+", "+strideSize+", "+pointersOffset[i]); } diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/DebugRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DebugRenderer.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/render/renderer/DebugRenderer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DebugRenderer.java index bf8c32bb0..13c99549a 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/DebugRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DebugRenderer.java @@ -1,23 +1,23 @@ -package com.seibel.lod.core.render.renderer; +package com.seibel.distanthorizons.core.render.renderer; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; -import com.seibel.lod.api.enums.config.ELoggerMode; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.logging.ConfigBasedSpamLogger; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.render.glObject.GLState; -import com.seibel.lod.core.render.glObject.buffer.GLElementBuffer; -import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; -import com.seibel.lod.core.render.glObject.shader.ShaderProgram; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttribute; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3d; -import com.seibel.lod.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.enums.config.ELoggerMode; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.render.glObject.GLState; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLElementBuffer; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttribute; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3d; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; import org.apache.logging.log4j.LogManager; import org.lwjgl.opengl.GL32; diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/IDebugRenderable.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/IDebugRenderable.java similarity index 57% rename from core/src/main/java/com/seibel/lod/core/render/renderer/IDebugRenderable.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/renderer/IDebugRenderable.java index 30a38f8bd..2285fad1b 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/IDebugRenderable.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/IDebugRenderable.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.render.renderer; +package com.seibel.distanthorizons.core.render.renderer; public interface IDebugRenderable { void debugRender(DebugRenderer r); diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderProgram.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderProgram.java index 5d4caab47..ad7e096f4 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderProgram.java @@ -17,24 +17,25 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.renderer; +package com.seibel.distanthorizons.core.render.renderer; import java.awt.Color; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.render.fog.LodFogConfig; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.core.render.glObject.shader.Shader; -import com.seibel.lod.core.render.glObject.shader.ShaderProgram; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttribute; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttributePostGL43; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttributePreGL43; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.shader.Shader; +import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttribute; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttributePostGL43; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttributePreGL43; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.render.fog.LodFogConfig; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; -public class LodRenderProgram extends ShaderProgram { +public class LodRenderProgram extends ShaderProgram +{ public static final String VERTEX_SHADER_PATH = "shaders/standard.vert"; public static final String VERTEX_CURVE_SHADER_PATH = "shaders/curve.vert"; public static final String FRAGMENT_SHADER_PATH = "shaders/flat_shaded.frag"; diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java index f1ea5dfb2..c054c685a 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java @@ -17,31 +17,31 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.renderer; +package com.seibel.distanthorizons.core.render.renderer; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.enums.rendering.EDebugRendering; -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; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.render.AbstractRenderBuffer; -import com.seibel.lod.core.render.RenderBufferHandler; -import com.seibel.lod.core.util.RenderUtil; -import com.seibel.lod.core.render.fog.LodFogConfig; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3d; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.core.render.glObject.GLState; -import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; -import com.seibel.lod.core.render.glObject.buffer.QuadElementBuffer; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.render.AbstractRenderBuffer; +import com.seibel.distanthorizons.core.render.RenderBufferHandler; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.GLState; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.render.glObject.buffer.QuadElementBuffer; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.RenderUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; +import com.seibel.distanthorizons.api.enums.rendering.EDebugRendering; +import com.seibel.distanthorizons.api.enums.rendering.EFogColorMode; +import com.seibel.distanthorizons.core.render.fog.LodFogConfig; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3d; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; import org.apache.logging.log4j.LogManager; import org.lwjgl.opengl.GL32; diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/SSAORenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/SSAORenderer.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/render/renderer/SSAORenderer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/renderer/SSAORenderer.java index 338950e7b..fcbcbdda7 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/SSAORenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/SSAORenderer.java @@ -1,22 +1,20 @@ -package com.seibel.lod.core.render.renderer; +package com.seibel.distanthorizons.core.render.renderer; -import com.seibel.lod.api.enums.config.EGpuUploadMethod; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.render.glObject.GLState; -import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; -import com.seibel.lod.core.render.glObject.shader.ShaderProgram; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttribute; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.RenderUtil; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.render.glObject.GLState; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttribute; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.RenderUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL32; -import javax.swing.*; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.util.function.Consumer; public class SSAORenderer { public static SSAORenderer INSTANCE = new SSAORenderer(); diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/TestRenderer.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/renderer/TestRenderer.java index fdb6fe5f3..63735ae92 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/TestRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/TestRenderer.java @@ -17,20 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.renderer; +package com.seibel.distanthorizons.core.render.renderer; -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; +import com.seibel.distanthorizons.api.enums.config.EGpuUploadMethod; +import com.seibel.distanthorizons.api.enums.config.ELoggerMode; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; +import com.seibel.distanthorizons.core.render.glObject.GLProxy; +import com.seibel.distanthorizons.core.render.glObject.GLState; +import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer; +import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram; +import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexAttribute; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.logging.ConfigBasedSpamLogger; -import com.seibel.lod.core.render.glObject.GLProxy; -import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer; -import com.seibel.lod.core.render.glObject.GLState; -import com.seibel.lod.core.render.glObject.shader.ShaderProgram; -import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttribute; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import org.apache.logging.log4j.LogManager; import org.lwjgl.opengl.GL32; diff --git a/core/src/main/java/com/seibel/lod/core/render/vertexFormat/DefaultLodVertexFormats.java b/core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/DefaultLodVertexFormats.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/render/vertexFormat/DefaultLodVertexFormats.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/DefaultLodVertexFormats.java index d73ed1ab3..429a64190 100644 --- a/core/src/main/java/com/seibel/lod/core/render/vertexFormat/DefaultLodVertexFormats.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/DefaultLodVertexFormats.java @@ -17,11 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.vertexFormat; +package com.seibel.distanthorizons.core.render.vertexFormat; import com.google.common.collect.ImmutableList; -import com.seibel.lod.core.render.vertexFormat.LodVertexFormat; -import com.seibel.lod.core.render.vertexFormat.LodVertexFormatElement; /** * A (almost) exact copy of MC's diff --git a/core/src/main/java/com/seibel/lod/core/render/vertexFormat/LodVertexFormat.java b/core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/LodVertexFormat.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/render/vertexFormat/LodVertexFormat.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/LodVertexFormat.java index 463544c90..44710cdd4 100644 --- a/core/src/main/java/com/seibel/lod/core/render/vertexFormat/LodVertexFormat.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/LodVertexFormat.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.vertexFormat; +package com.seibel.distanthorizons.core.render.vertexFormat; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/seibel/lod/core/render/vertexFormat/LodVertexFormatElement.java b/core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/LodVertexFormatElement.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/render/vertexFormat/LodVertexFormatElement.java rename to core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/LodVertexFormatElement.java index e141b5921..3d8e26e74 100644 --- a/core/src/main/java/com/seibel/lod/core/render/vertexFormat/LodVertexFormatElement.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/vertexFormat/LodVertexFormatElement.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.render.vertexFormat; +package com.seibel.distanthorizons.core.render.vertexFormat; import org.lwjgl.opengl.GL11; diff --git a/core/src/main/java/com/seibel/lod/core/util/AnnotationUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/AnnotationUtil.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/util/AnnotationUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/AnnotationUtil.java index e5e480328..29f2f31f2 100644 --- a/core/src/main/java/com/seibel/lod/core/util/AnnotationUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/AnnotationUtil.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/util/AtomicsUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/AtomicsUtil.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/AtomicsUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/AtomicsUtil.java index 3dd3d9da7..2378108aa 100644 --- a/core/src/main/java/com/seibel/lod/core/util/AtomicsUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/AtomicsUtil.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; import it.unimi.dsi.fastutil.booleans.BooleanObjectImmutablePair; diff --git a/core/src/main/java/com/seibel/lod/core/util/ColorUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/ColorUtil.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/util/ColorUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/ColorUtil.java index 2cc4f7300..228988b73 100644 --- a/core/src/main/java/com/seibel/lod/core/util/ColorUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/ColorUtil.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; /** * Handles the bit-wise math used when diff --git a/core/src/main/java/com/seibel/lod/core/util/EnumUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/EnumUtil.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/EnumUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/EnumUtil.java index 514ab6a62..56a181c76 100644 --- a/core/src/main/java/com/seibel/lod/core/util/EnumUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/EnumUtil.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; import java.io.InvalidObjectException; diff --git a/core/src/main/java/com/seibel/lod/core/util/FileScanUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/FileScanUtil.java similarity index 79% rename from core/src/main/java/com/seibel/lod/core/util/FileScanUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/FileScanUtil.java index 3dbe46909..7097c8285 100644 --- a/core/src/main/java/com/seibel/lod/core/util/FileScanUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/FileScanUtil.java @@ -1,10 +1,10 @@ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; -import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; -import com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider; -import com.seibel.lod.core.file.structure.AbstractSaveStructure; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; +import com.seibel.distanthorizons.core.file.renderfile.ILodRenderSourceProvider; +import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/seibel/lod/core/util/FileUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/FileUtil.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/util/FileUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/FileUtil.java index 377f5ac11..3ededde0c 100644 --- a/core/src/main/java/com/seibel/lod/core/util/FileUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/FileUtil.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; -import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import org.apache.logging.log4j.Logger; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/util/FullDataPointUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/FullDataPointUtil.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/util/FullDataPointUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/FullDataPointUtil.java index 17b9419e4..11dc94c1a 100644 --- a/core/src/main/java/com/seibel/lod/core/util/FullDataPointUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/FullDataPointUtil.java @@ -1,11 +1,9 @@ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; // import org.jetbrains.annotations.Contract; -import static com.seibel.lod.core.util.RenderDataPointUtil.MAX_WORLD_Y_SIZE; - /** * A helper class that is used to access the data from a long * formatted as a full data point.
@@ -61,9 +59,9 @@ public class FullDataPointUtil /** creates a new datapoint with the given values */ public static long encode(int id, int depth, int y, byte lightPair) { - LodUtil.assertTrue(y >= 0 && y < MAX_WORLD_Y_SIZE, "Trying to create datapoint with y[{}] out of range!", y); - LodUtil.assertTrue(depth > 0 && depth < MAX_WORLD_Y_SIZE, "Trying to create datapoint with depth[{}] out of range!", depth); - LodUtil.assertTrue(y+depth <= MAX_WORLD_Y_SIZE, "Trying to create datapoint with y+depth[{}] out of range!", y+depth); + LodUtil.assertTrue(y >= 0 && y < RenderDataPointUtil.MAX_WORLD_Y_SIZE, "Trying to create datapoint with y[{}] out of range!", y); + LodUtil.assertTrue(depth > 0 && depth < RenderDataPointUtil.MAX_WORLD_Y_SIZE, "Trying to create datapoint with depth[{}] out of range!", depth); + LodUtil.assertTrue(y+depth <= RenderDataPointUtil.MAX_WORLD_Y_SIZE, "Trying to create datapoint with y+depth[{}] out of range!", y+depth); long data = 0; data |= id & ID_MASK; diff --git a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/LodUtil.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/util/LodUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/LodUtil.java index a3eb4585d..56885f1ab 100644 --- a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/LodUtil.java @@ -17,23 +17,22 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; import java.util.Iterator; -import com.seibel.lod.core.config.Config; -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; -import com.seibel.lod.core.pos.Pos2D; -import com.seibel.lod.core.render.vertexFormat.DefaultLodVertexFormats; -import com.seibel.lod.core.render.vertexFormat.LodVertexFormat; -import com.seibel.lod.core.util.gridList.EdgeDistanceBooleanGrid; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.api.enums.config.EVanillaOverdraw; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.render.vertexFormat.DefaultLodVertexFormats; +import com.seibel.distanthorizons.core.render.vertexFormat.LodVertexFormat; +import com.seibel.distanthorizons.core.util.gridList.EdgeDistanceBooleanGrid; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import org.apache.logging.log4j.Logger; /** diff --git a/core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/RayCastUtil.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/RayCastUtil.java index 8fb0d7c62..36b593f6c 100644 --- a/core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/RayCastUtil.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/util/RenderDataPointUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointUtil.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/RenderDataPointUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointUtil.java index 0a198c189..69719d921 100644 --- a/core/src/main/java/com/seibel/lod/core/util/RenderDataPointUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointUtil.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; -import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; -import com.seibel.lod.core.dataObjects.render.columnViews.IColumnDataView; -import com.seibel.lod.core.logging.SpamReducedLogger; +import com.seibel.distanthorizons.core.logging.SpamReducedLogger; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView; +import com.seibel.distanthorizons.core.dataObjects.render.columnViews.IColumnDataView; import java.util.Arrays; diff --git a/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java similarity index 89% rename from core/src/main/java/com/seibel/lod/core/util/RenderUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java index 05ef287f8..800ef9113 100644 --- a/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java @@ -17,22 +17,22 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; -import com.seibel.lod.api.enums.config.EOverdrawPrevention; -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.world.IDhClientWorld; -import com.seibel.lod.core.api.internal.SharedApi; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.coreapi.util.MathUtil; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.api.enums.config.EOverdrawPrevention; +import com.seibel.distanthorizons.core.api.internal.SharedApi; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.world.IDhClientWorld; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.coreapi.util.MathUtil; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; /** * This holds miscellaneous helper code diff --git a/core/src/main/java/com/seibel/lod/core/util/ThreadUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/ThreadUtil.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/util/ThreadUtil.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/ThreadUtil.java index 76261f5cf..a4e146f0f 100644 --- a/core/src/main/java/com/seibel/lod/core/util/ThreadUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/ThreadUtil.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.util; +package com.seibel.distanthorizons.core.util; -import com.seibel.lod.core.util.objects.DhThreadFactory; +import com.seibel.distanthorizons.core.util.objects.DhThreadFactory; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/core/src/main/java/com/seibel/lod/core/util/gridList/ArrayGridList.java b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/ArrayGridList.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/util/gridList/ArrayGridList.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/gridList/ArrayGridList.java index 6a9acf533..21265e8d6 100644 --- a/core/src/main/java/com/seibel/lod/core/util/gridList/ArrayGridList.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/ArrayGridList.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.gridList; +package com.seibel.distanthorizons.core.util.gridList; -import com.seibel.lod.core.pos.Pos2D; +import com.seibel.distanthorizons.core.pos.Pos2D; import java.util.ArrayList; import java.util.function.BiConsumer; diff --git a/core/src/main/java/com/seibel/lod/core/util/gridList/EdgeDistanceBooleanGrid.java b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/EdgeDistanceBooleanGrid.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/util/gridList/EdgeDistanceBooleanGrid.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/gridList/EdgeDistanceBooleanGrid.java index deb619b7e..7a4b0a0a8 100644 --- a/core/src/main/java/com/seibel/lod/core/util/gridList/EdgeDistanceBooleanGrid.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/EdgeDistanceBooleanGrid.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.gridList; +package com.seibel.distanthorizons.core.util.gridList; -import com.seibel.lod.core.util.objects.BoolType; -import com.seibel.lod.core.pos.Pos2D; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.util.objects.BoolType; import java.util.Iterator; import java.util.function.IntPredicate; diff --git a/core/src/main/java/com/seibel/lod/core/util/gridList/MovableGridRingList.java b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/MovableGridRingList.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/gridList/MovableGridRingList.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/gridList/MovableGridRingList.java index d14faca0a..b73a69ba1 100644 --- a/core/src/main/java/com/seibel/lod/core/util/gridList/MovableGridRingList.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/MovableGridRingList.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.gridList; +package com.seibel.distanthorizons.core.util.gridList; -import com.seibel.lod.core.pos.Pos2D; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.util.LodUtil; import java.util.*; import java.util.concurrent.atomic.AtomicReference; diff --git a/core/src/main/java/com/seibel/lod/core/util/gridList/PosArrayGridList.java b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/PosArrayGridList.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/gridList/PosArrayGridList.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/gridList/PosArrayGridList.java index abc2714d9..ec3b4bbd2 100644 --- a/core/src/main/java/com/seibel/lod/core/util/gridList/PosArrayGridList.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/gridList/PosArrayGridList.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.gridList; +package com.seibel.distanthorizons.core.util.gridList; import java.util.function.BiConsumer; import java.util.function.BiFunction; diff --git a/core/src/main/java/com/seibel/lod/core/util/math/UnitBytes.java b/core/src/main/java/com/seibel/distanthorizons/core/util/math/UnitBytes.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/util/math/UnitBytes.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/math/UnitBytes.java index 2b33dfbf5..2d28cec32 100644 --- a/core/src/main/java/com/seibel/lod/core/util/math/UnitBytes.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/math/UnitBytes.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.math; +package com.seibel.distanthorizons.core.util.math; import java.util.Objects; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/BoolType.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/BoolType.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/util/objects/BoolType.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/BoolType.java index 4cdc928fa..8461d2113 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/BoolType.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/BoolType.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; public final class BoolType { public static final BoolType TRUE = new BoolType(); diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/DhThreadFactory.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/DhThreadFactory.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/util/objects/DhThreadFactory.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/DhThreadFactory.java index aa955bdbd..7dcc897a4 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/DhThreadFactory.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/DhThreadFactory.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; import java.lang.invoke.MethodHandles; import java.lang.ref.WeakReference; import java.util.LinkedList; import java.util.concurrent.ThreadFactory; -import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/DummyRunExecutorService.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/DummyRunExecutorService.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/objects/DummyRunExecutorService.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/DummyRunExecutorService.java index 2dc64e81d..342531e73 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/DummyRunExecutorService.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/DummyRunExecutorService.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/EventLoop.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/EventLoop.java index 44a053d18..9d7f3b555 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/EventLoop.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.coreapi.ModInfo; import org.apache.logging.log4j.Logger; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/EventTimer.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/EventTimer.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/util/objects/EventTimer.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/EventTimer.java index db76adceb..a458018bf 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/EventTimer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/EventTimer.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; import java.time.Duration; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/GLMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessage.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/objects/GLMessage.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessage.java index 9df70b1ba..8fd7a8dc0 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/GLMessage.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessage.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; -import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import org.apache.logging.log4j.Logger; import java.lang.invoke.MethodHandles; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/GLMessageOutputStream.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessageOutputStream.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/util/objects/GLMessageOutputStream.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessageOutputStream.java index ddf9ad058..6736ff39e 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/GLMessageOutputStream.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessageOutputStream.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/ParsedIp.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/ParsedIp.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/objects/ParsedIp.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/ParsedIp.java index eca4fca5b..b97e5268d 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/ParsedIp.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/ParsedIp.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; /** diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/Reference.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/Reference.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/util/objects/Reference.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/Reference.java index 5ffb0206a..6686cedd9 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/Reference.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/Reference.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; public class Reference { diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/SortedArraySet.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/SortedArraySet.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/util/objects/SortedArraySet.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/SortedArraySet.java index 8c0fe6ae1..967a555af 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/SortedArraySet.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/SortedArraySet.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; import java.util.*; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/StatsMap.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/StatsMap.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/util/objects/StatsMap.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/StatsMap.java index c3b3b072c..ad8c53c6e 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/StatsMap.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/StatsMap.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; -import com.seibel.lod.core.util.math.UnitBytes; +import com.seibel.distanthorizons.core.util.math.UnitBytes; import java.util.TreeMap; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/UncheckedInterruptedException.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/UncheckedInterruptedException.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/util/objects/UncheckedInterruptedException.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/UncheckedInterruptedException.java index e4594cdc2..c385e88fa 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/UncheckedInterruptedException.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/UncheckedInterruptedException.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util.objects; +package com.seibel.distanthorizons.core.util.objects; import java.util.concurrent.CompletionException; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/dataStreams/DhDataInputStream.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/util/objects/dataStreams/DhDataInputStream.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java index 753b40afc..9a1b7068f 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/dataStreams/DhDataInputStream.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util.objects.dataStreams; +package com.seibel.distanthorizons.core.util.objects.dataStreams; import net.jpountz.lz4.LZ4FrameInputStream; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/dataStreams/DhDataOutputStream.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/util/objects/dataStreams/DhDataOutputStream.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java index 1cc3f39ef..6fb607377 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/dataStreams/DhDataOutputStream.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util.objects.dataStreams; +package com.seibel.distanthorizons.core.util.objects.dataStreams; import net.jpountz.lz4.LZ4FrameOutputStream; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadNode.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/QuadNode.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadNode.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/QuadNode.java index 8eb349b79..d7f023a7f 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadNode.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/QuadNode.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.util.objects.quadTree; +package com.seibel.distanthorizons.core.util.objects.quadTree; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.quadTree.iterators.QuadNodeDirectChildIterator; -import com.seibel.lod.core.util.objects.quadTree.iterators.QuadNodeDirectChildPosIterator; -import com.seibel.lod.core.util.objects.quadTree.iterators.QuadTreeNodeIterator; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.objects.quadTree.iterators.QuadNodeDirectChildIterator; +import com.seibel.distanthorizons.core.util.objects.quadTree.iterators.QuadNodeDirectChildPosIterator; +import com.seibel.distanthorizons.core.util.objects.quadTree.iterators.QuadTreeNodeIterator; import org.apache.logging.log4j.Logger; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/QuadTree.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/QuadTree.java index ee9e947c5..235a5abda 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/QuadTree.java @@ -1,14 +1,14 @@ -package com.seibel.lod.core.util.objects.quadTree; +package com.seibel.distanthorizons.core.util.objects.quadTree; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.pos.Pos2D; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.coreapi.util.MathUtil; -import com.seibel.lod.core.util.gridList.MovableGridRingList; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; +import com.seibel.distanthorizons.core.util.gridList.MovableGridRingList; import org.apache.logging.log4j.Logger; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java similarity index 90% rename from core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java index 6cb66787b..4a848a85a 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.util.objects.quadTree.iterators; +package com.seibel.distanthorizons.core.util.objects.quadTree.iterators; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; import java.util.Iterator; import java.util.LinkedList; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeDirectChildIterator.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeDirectChildIterator.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeDirectChildIterator.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeDirectChildIterator.java index b5049724c..c30a89795 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeDirectChildIterator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeDirectChildIterator.java @@ -1,7 +1,6 @@ -package com.seibel.lod.core.util.objects.quadTree.iterators; +package com.seibel.distanthorizons.core.util.objects.quadTree.iterators; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeDirectChildPosIterator.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeDirectChildPosIterator.java similarity index 84% rename from core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeDirectChildPosIterator.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeDirectChildPosIterator.java index c304d1769..fc69cd958 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadNodeDirectChildPosIterator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeDirectChildPosIterator.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.util.objects.quadTree.iterators; +package com.seibel.distanthorizons.core.util.objects.quadTree.iterators; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java similarity index 96% rename from core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java rename to core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java index 5d22816f1..323fb3926 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.util.objects.quadTree.iterators; +package com.seibel.distanthorizons.core.util.objects.quadTree.iterators; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; import java.util.Iterator; import java.util.LinkedList; diff --git a/core/src/main/java/com/seibel/lod/core/world/AbstractDhWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhWorld.java similarity index 53% rename from core/src/main/java/com/seibel/lod/core/world/AbstractDhWorld.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhWorld.java index d9e9227fd..880dbf51a 100644 --- a/core/src/main/java/com/seibel/lod/core/world/AbstractDhWorld.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhWorld.java @@ -1,16 +1,9 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.interfaces.world.IDhApiWorldProxy; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import org.apache.logging.log4j.Logger; import java.io.Closeable; -import java.util.ArrayList; -import java.util.concurrent.CompletableFuture; /** * Represents an entire world (aka server) and diff --git a/core/src/main/java/com/seibel/lod/core/world/DhApiWorldProxy.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhApiWorldProxy.java similarity index 80% rename from core/src/main/java/com/seibel/lod/core/world/DhApiWorldProxy.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/DhApiWorldProxy.java index 4ba01361f..3572890dc 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhApiWorldProxy.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhApiWorldProxy.java @@ -1,14 +1,14 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.api.interfaces.world.IDhApiWorldProxy; -import com.seibel.lod.core.api.internal.SharedApi; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiWorldProxy; +import com.seibel.distanthorizons.core.api.internal.SharedApi; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java index d705314f4..17f4163d5 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java @@ -1,15 +1,15 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.core.level.DhClientServerLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.file.structure.LocalSaveStructure; -import com.seibel.lod.core.logging.f3.F3Screen; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.util.objects.EventLoop; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.file.structure.LocalSaveStructure; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.logging.f3.F3Screen; +import com.seibel.distanthorizons.core.level.DhClientServerLevel; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.util.objects.EventLoop; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import java.io.File; import java.util.HashMap; diff --git a/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java index f9d4c24d8..08b12a129 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java @@ -1,12 +1,12 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.core.level.DhClientLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.file.structure.ClientOnlySaveStructure; -import com.seibel.lod.core.util.ThreadUtil; -import com.seibel.lod.core.util.objects.EventLoop; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.level.DhClientLevel; +import com.seibel.distanthorizons.core.util.ThreadUtil; +import com.seibel.distanthorizons.core.util.objects.EventLoop; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import java.io.File; import java.util.HashMap; diff --git a/core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java similarity index 83% rename from core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java index 98215bff2..aa0574629 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java @@ -1,11 +1,11 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.core.level.DhServerLevel; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.file.structure.LocalSaveStructure; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.file.structure.LocalSaveStructure; +import com.seibel.distanthorizons.core.level.DhServerLevel; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import java.io.File; import java.util.HashMap; diff --git a/core/src/main/java/com/seibel/lod/core/world/EWorldEnvironment.java b/core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java similarity index 75% rename from core/src/main/java/com/seibel/lod/core/world/EWorldEnvironment.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java index b4e3d653b..a4fcf5976 100644 --- a/core/src/main/java/com/seibel/lod/core/world/EWorldEnvironment.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; /** * Client_Only, diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/IDhClientWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhClientWorld.java new file mode 100644 index 000000000..ccac84a10 --- /dev/null +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhClientWorld.java @@ -0,0 +1,12 @@ +package com.seibel.distanthorizons.core.world; + +import com.seibel.distanthorizons.core.level.IDhClientLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; + +public interface IDhClientWorld extends IDhWorld +{ + void clientTick(); + + default IDhClientLevel getOrLoadClientLevel(ILevelWrapper levelWrapper) { return (IDhClientLevel) this.getOrLoadLevel(levelWrapper); } + +} diff --git a/core/src/main/java/com/seibel/lod/core/world/IDhServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhServerWorld.java similarity index 57% rename from core/src/main/java/com/seibel/lod/core/world/IDhServerWorld.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/IDhServerWorld.java index 6b523c029..87a765a7b 100644 --- a/core/src/main/java/com/seibel/lod/core/world/IDhServerWorld.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhServerWorld.java @@ -1,8 +1,7 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.core.level.IDhServerLevel; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.level.IDhServerLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; /** Used both for dedicated server and singleplayer worlds */ public interface IDhServerWorld extends IDhWorld diff --git a/core/src/main/java/com/seibel/lod/core/world/IDhWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java similarity index 64% rename from core/src/main/java/com/seibel/lod/core/world/IDhWorld.java rename to core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java index e3377a159..9aa5a5c20 100644 --- a/core/src/main/java/com/seibel/lod/core/world/IDhWorld.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.world; +package com.seibel.distanthorizons.core.world; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import java.util.concurrent.CompletableFuture; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/IVersionConstants.java similarity index 91% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/IVersionConstants.java index f51454f2c..5b77c44be 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/IVersionConstants.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces; +package com.seibel.distanthorizons.core.wrapperInterfaces; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * A singleton that contains variables specific to each version of Minecraft diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/IWrapperFactory.java similarity index 73% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/IWrapperFactory.java index b596e1098..ef271da61 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/IWrapperFactory.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces; +package com.seibel.distanthorizons.core.wrapperInterfaces; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import java.io.IOException; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/block/IBlockStateWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java similarity index 59% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/block/IBlockStateWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java index 92f745388..c231cf116 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/block/IBlockStateWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.wrapperInterfaces.block; +package com.seibel.distanthorizons.core.wrapperInterfaces.block; -import com.seibel.lod.api.interfaces.block.IDhApiBlockStateWrapper; +import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper; /** * A Minecraft version independent way of handling Blocks. diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java index 8bd0b542d..19c4b8982 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.chunk; +package com.seibel.distanthorizons.core.wrapperInterfaces.chunk; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; public interface IChunkWrapper extends IBindable { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/config/ILangWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/config/ILangWrapper.java new file mode 100644 index 000000000..f001715a7 --- /dev/null +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/config/ILangWrapper.java @@ -0,0 +1,10 @@ +package com.seibel.distanthorizons.core.wrapperInterfaces.config; + +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; + +public interface ILangWrapper extends IBindable { + + boolean langExists(String str); + + String getLang(String str); +} diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java index 27dc8a4c6..252a2bea6 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java @@ -17,17 +17,17 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.minecraft; +package com.seibel.distanthorizons.core.wrapperInterfaces.minecraft; import java.io.File; import java.util.ArrayList; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import org.apache.logging.log4j.Level; /** diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java similarity index 80% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java index 6a667b914..d928cf8e7 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java @@ -17,24 +17,24 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.minecraft; +package com.seibel.distanthorizons.core.wrapperInterfaces.minecraft; import java.awt.Color; import java.util.HashSet; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3d; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3d; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; /** * Contains everything related to diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java similarity index 61% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java index f2e594cd9..9e4985ec9 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java @@ -1,6 +1,6 @@ -package com.seibel.lod.core.wrapperInterfaces.minecraft; +package com.seibel.distanthorizons.core.wrapperInterfaces.minecraft; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IProfilerWrapper.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IProfilerWrapper.java index 85815fd35..4159d041e 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IProfilerWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.minecraft; +package com.seibel.distanthorizons.core.wrapperInterfaces.minecraft; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java similarity index 87% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java index 933590292..0d53486a8 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.misc; +package com.seibel.distanthorizons.core.wrapperInterfaces.misc; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/AbstractOptifineAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/AbstractOptifineAccessor.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/AbstractOptifineAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/AbstractOptifineAccessor.java index 396306d84..7bec13ab1 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/AbstractOptifineAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/AbstractOptifineAccessor.java @@ -1,9 +1,9 @@ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; -import com.seibel.lod.api.enums.rendering.EFogDrawMode; -import com.seibel.lod.core.ReflectionHandler; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.api.enums.rendering.EFogDrawMode; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.ReflectionHandler; import java.lang.reflect.Field; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IBCLibAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IBCLibAccessor.java similarity index 65% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IBCLibAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IBCLibAccessor.java index 796339cf8..5a9312311 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IBCLibAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IBCLibAccessor.java @@ -1,6 +1,4 @@ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; - -import java.awt.*; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; public interface IBCLibAccessor extends IModAccessor { /** Sets the BCLib custom fog renderer */ diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IImmersivePortalsAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IImmersivePortalsAccessor.java new file mode 100644 index 000000000..743d8d27b --- /dev/null +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IImmersivePortalsAccessor.java @@ -0,0 +1,4 @@ +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; + +public interface IImmersivePortalsAccessor extends IModAccessor { +} diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModAccessor.java similarity index 85% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModAccessor.java index c5d64d23f..1661aaf2c 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModAccessor.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * @author Leetom diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModChecker.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModChecker.java index 7eb11d9a6..05ee93585 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IModChecker.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * Checks if a mod is loaded diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IOptifineAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IOptifineAccessor.java similarity index 78% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IOptifineAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IOptifineAccessor.java index c8c74b852..b2d74b717 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IOptifineAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IOptifineAccessor.java @@ -17,14 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; -import com.seibel.lod.api.enums.rendering.EFogDrawMode; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.api.enums.rendering.EFogDrawMode; +import com.seibel.distanthorizons.core.pos.DhChunkPos; -import java.lang.reflect.Field; import java.util.HashSet; public interface IOptifineAccessor extends IModAccessor diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/ISodiumAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/ISodiumAccessor.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/ISodiumAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/ISodiumAccessor.java index 9ca8f7094..16204db0a 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/ISodiumAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/ISodiumAccessor.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; -import com.seibel.lod.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; import java.util.HashSet; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IStarlightAccessor.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IStarlightAccessor.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IStarlightAccessor.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IStarlightAccessor.java index b388aa6d8..6618610be 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IStarlightAccessor.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/modAccessor/IStarlightAccessor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; +package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor; public interface IStarlightAccessor extends IModAccessor { diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java similarity index 81% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java index 00f01f46f..69fabc533 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.world; +package com.seibel.distanthorizons.core.wrapperInterfaces.world; -import com.seibel.lod.api.interfaces.block.IDhApiBiomeWrapper; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IClientLevelWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java similarity index 59% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IClientLevelWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java index b78f97e68..731893200 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IClientLevelWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java @@ -1,7 +1,7 @@ -package com.seibel.lod.core.wrapperInterfaces.world; +package com.seibel.distanthorizons.core.wrapperInterfaces.world; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IDimensionTypeWrapper.java similarity index 81% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IDimensionTypeWrapper.java index 8570c4266..044e62b99 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IDimensionTypeWrapper.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.world; +package com.seibel.distanthorizons.core.wrapperInterfaces.world; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * @author James Seibel diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java similarity index 74% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java index 1d66b6d81..ecb627823 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.world; +package com.seibel.distanthorizons.core.wrapperInterfaces.world; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * Can be either a Server world or a Client world. diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IServerLevelWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java similarity index 76% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IServerLevelWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java index 5634624ff..63bf3046f 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IServerLevelWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IServerLevelWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.wrapperInterfaces.world; +package com.seibel.distanthorizons.core.wrapperInterfaces.world; import javax.annotation.Nullable; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvironmentWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvironmentWrapper.java similarity index 82% rename from core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvironmentWrapper.java rename to core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvironmentWrapper.java index fd9342246..d7d282639 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvironmentWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvironmentWrapper.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.wrapperInterfaces.worldGeneration; +package com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/core/src/main/java/com/seibel/lod/core/jar/JarDependencySetup.java b/core/src/main/java/com/seibel/lod/core/jar/JarDependencySetup.java deleted file mode 100644 index eff3e1cc4..000000000 --- a/core/src/main/java/com/seibel/lod/core/jar/JarDependencySetup.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.seibel.lod.core.jar; - -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.jar.wrapperInterfaces.config.LangWrapper; -import com.seibel.lod.core.wrapperInterfaces.config.ILangWrapper; - -public class JarDependencySetup { - public static void createInitialBindings() { - SingletonInjector.INSTANCE.bind(ILangWrapper.class, LangWrapper.INSTANCE); - LangWrapper.init(); - } -} diff --git a/core/src/main/java/com/seibel/lod/core/world/IDhClientWorld.java b/core/src/main/java/com/seibel/lod/core/world/IDhClientWorld.java deleted file mode 100644 index 6cdc1435b..000000000 --- a/core/src/main/java/com/seibel/lod/core/world/IDhClientWorld.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.seibel.lod.core.world; - -import com.seibel.lod.core.level.IDhClientLevel; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; - -public interface IDhClientWorld extends IDhWorld -{ - void clientTick(); - - default IDhClientLevel getOrLoadClientLevel(ILevelWrapper levelWrapper) { return (IDhClientLevel) this.getOrLoadLevel(levelWrapper); } - -} diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java deleted file mode 100644 index c96c094f8..000000000 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.seibel.lod.core.wrapperInterfaces.config; - -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; - -public interface ILangWrapper extends IBindable { - - boolean langExists(String str); - - String getLang(String str); -} diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IImmersivePortalsAccessor.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IImmersivePortalsAccessor.java deleted file mode 100644 index c6c40ca67..000000000 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IImmersivePortalsAccessor.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.seibel.lod.core.wrapperInterfaces.modAccessor; - -import com.seibel.lod.core.pos.DhChunkPos; - -import java.util.HashSet; - -public interface IImmersivePortalsAccessor extends IModAccessor { -} diff --git a/core/src/main/resources/assets/distanthorizons/lang/en_us.json b/core/src/main/resources/assets/distanthorizons/lang/en_us.json new file mode 100644 index 000000000..a8b36a6d3 --- /dev/null +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -0,0 +1,692 @@ +{ + "distanthorizons.title": + "Distant Horizons", + + + + "distanthorizons.general.back": + "Back", + "distanthorizons.general.next": + "Next", + "distanthorizons.general.done": + "Done", + "distanthorizons.general.cancel": + "Cancel", + "distanthorizons.general.yes": + "Yes", + "distanthorizons.general.no": + "No", + + + + + "distanthorizons.updater.title": + "Distant Horizons auto updater", + "distanthorizons.updater.text1": + "§lNew update available!", + "distanthorizons.updater.text2": + "§fDo you want to update from %s§f to %s§f?", + "distanthorizons.updater.later": + "Not now", + "distanthorizons.updater.never": + "Don't show again", + "distanthorizons.updater.update": + "Update", + "distanthorizons.updater.update.@tooltip": + "Updates the mod this 1 time\n(Updates when game closed)", + "distanthorizons.updater.silent": + "Always silent update", + "distanthorizons.updater.silent.@tooltip": + "Every time an update is available, it would update\n(§6WARNING§r: It wont prompt the user on an update, tough it would keep the mod up to date)", + "distanthorizons.updater.waitingForClose": + "Distant Horizons will finish update once game restarts", + + + + + "distanthorizons.config.title": + "Distant Horizons config", + "distanthorizons.config.client": + "Client", + + "distanthorizons.config.client.quickEnableRendering": + "Enable Rendering", + "distanthorizons.config.client.quickEnableRendering.@tooltip": + "Determines if Distant Horizons Renders LODs.", + + "distanthorizons.config.client.qualityPresetSetting": + "Quality Preset", + "distanthorizons.config.client.qualityPresetSetting.@tooltip": + "Modifies a number of graphical settings to quickly change Distant Horizons' rendering quality. \n\nLower this setting if your GPU is at max usage or you are having framerate issues.", + "distanthorizons.config.client.threadPresetSetting": + "CPU Load", + "distanthorizons.config.client.threadPresetSetting.@tooltip": + "Modifies how many threads Distant Horizons' will use. \n\nIncreasing this setting will improve the Distant Generator speed and LOD loading speed, \nbut will also increase CPU/memory usage and may introduce stuttering. \n\nNote: on CPUs with 4 cores or less these settings will be less effective \nand some settings will give similar results.", + + "distanthorizons.config.client.optionsButton": + "Show The Options Button", + "distanthorizons.config.client.optionsButton.@tooltip": + "Show the config button to the left of the fov button", + + + + "distanthorizons.config.client.advanced": + "Advanced options", + + "distanthorizons.config.client.advanced.graphics": + "Graphics", + "distanthorizons.config.client.advanced.graphics.quality": + "Render Quality", + + "distanthorizons.config.client.advanced.graphics.quality.maxHorizontalResolution": + "Max Horizontal Resolution", + "distanthorizons.config.client.advanced.graphics.quality.maxHorizontalResolution.@tooltip": + "The maximum detail LODs are rendered at.\n\n§6Fastest:§r Chunk\n§6Fanciest:§r Block", + "distanthorizons.config.client.advanced.graphics.quality.lodChunkRenderDistance": + "LOD Render Distance", + "distanthorizons.config.client.advanced.graphics.quality.lodChunkRenderDistance.@tooltip": + "Distant Horizons' render distance, measured in chunks. \n\nNote: this is a best effort number. \nThe render distance may be above or below this number \ndepending on your other graphic settings.", + "distanthorizons.config.client.advanced.graphics.quality.verticalQuality": + "Vertical Quality", + "distanthorizons.config.client.advanced.graphics.quality.verticalQuality.@tooltip": + "How well LODs represent overhangs, caves, cliffsides, etc.\n\nHigher options will increase memory and GPU usage.", + "distanthorizons.config.client.advanced.graphics.quality.horizontalScale": + "Horizontal Scale", + "distanthorizons.config.client.advanced.graphics.quality.horizontalScale.@tooltip": + "How quickly LODs drop off in quality.\n\nLarger numbers will improve how distant terrain looks\nbut will increase memory and GPU usage.", + "distanthorizons.config.client.advanced.graphics.quality.ssao": + "SSAO", + "distanthorizons.config.client.advanced.graphics.quality.ssao.@tooltip": + "Screen Space Ambient Occlusion adds depth to the lighting of blocks.", + "distanthorizons.config.client.advanced.graphics.quality.horizontalQuality": + "Horizontal Quality", + "distanthorizons.config.client.advanced.graphics.quality.horizontalQuality.@tooltip": + "How far apart drops in quality are.\n\nHigher settings will increase the distance between drops\nbut will increase memory and GPU usage.", + "distanthorizons.config.client.advanced.graphics.quality.transparency": + "Transparency", + "distanthorizons.config.client.advanced.graphics.quality.blocksToIgnore": + "Blocks To Ignore", + "distanthorizons.config.client.advanced.graphics.quality.blocksToIgnore.@tooltip": + "Defines the types of blocks to ignore when generating LODs.", + "distanthorizons.config.client.advanced.graphics.quality.tintWithAvoidedBlocks": + "Tint With Avoided Blocks", + "distanthorizons.config.client.advanced.graphics.quality.tintWithAvoidedBlocks.@tooltip": + "§4Note: makes snow, carpet, and trapdoors look really bad§r\nShould the blocks underneath avoided blocks gain the color of the avoided block?\n§6True:§r a red flower on grass will tint the grass below it red\n§6False:§r skipped blocks will not change color of surface below them", + "distanthorizons.config.client.advanced.graphics.quality.lodBiomeBlending": + "Biome Blending", + "distanthorizons.config.client.advanced.graphics.quality.lodBiomeBlending.@tooltip": + "This is the same as vanilla Biome Blending settings for LOD area. \n\nNote that anything other than '0' will greatly effect Lod building time\nand increase triangle count. The cost on chunk generation speed is also \nquite large if set to too high.\n\n'0' equals to Vanilla Biome Blending of '1x1', \n'1' equals to Vanilla Biome Blending of '3x3', \n'2' equals to Vanilla Biome Blending of '5x5'... \n", + + + "distanthorizons.config.client.advanced.graphics.fog": + "Fog", + + "distanthorizons.config.client.advanced.graphics.fog.drawMode": + "Fog Draw Mode", + "distanthorizons.config.client.advanced.graphics.fog.drawMode.@tooltip": + "When fog will be rendered on the LODs.", + "distanthorizons.config.client.advanced.graphics.fog.distance": + "Fog Distance", + "distanthorizons.config.client.advanced.graphics.fog.distance.@tooltip": + "The distance(s) Fog will be rendered on the LODs.", + "distanthorizons.config.client.advanced.graphics.fog.colorMode": + "Fog Color Mode", + "distanthorizons.config.client.advanced.graphics.fog.colorMode.@tooltip": + "The color of the fog on LODs.", + "distanthorizons.config.client.advanced.graphics.fog.disableVanillaFog": + "Disable Vanilla Fog", + "distanthorizons.config.client.advanced.graphics.fog.disableVanillaFog.@tooltip": + "§6True:§r disables Minecraft's fog on vanilla chunks.\n§6False:§r Minecraft renders fog like normal.\n\nMay cause issues with other mods that edit fog.\nDisable if vanilla chunks are completely covered in fog.", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog": + "Advanced Fog Options", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogStart": + "Far Fog Start", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogStart.@tooltip": + "Where should the far fog start? \n\n '0.0': Fog start at player's position.\n '1.0': The fog-start's circle fit just in the lod render distance square.\n'1.414': The lod render distance square fit just in the fog-start's circle.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogEnd": + "Far Fog End", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogEnd.@tooltip": + "Where should the far fog end? \n\n '0.0': Fog end at player's position.\n '1.0': The fog-end's circle fit just in the lod render distance square.\n'1.414': The lod render distance square fit just in the fog-end's circle.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogMin": + "Far Fog Min", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogMin.@tooltip": + "What is the minimum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogMax": + "Far Fog Max", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogMax.@tooltip": + "What is the maximum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogFalloff": + "Far Fog Falloff", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogFalloff.@tooltip": + "How should the fog thickness should be calculated? \n\nLINEAR: Linear based on distance (will ignore 'density')\nEXPONENTIAL: 1/(e^(distance*density)) \nEXPONENTIAL_SQUARED: 1/(e^((distance*density)^2) \n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogDensity": + "Far Fog Density", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.farFogDensity.@tooltip": + "What is the fog density? ", + + + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog": + "Height Fog Options", + + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMixMode": + "Height Fog Mix Mode", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMixMode.@tooltip": + "How the height should effect the fog thickness combined with the normal function? \n\nBASIC: No special height fog effect. Fog is calculated based on camera distance \nIGNORE_HEIGHT: Ignore height completely. Fog is calculated based on horizontal distance \nADDITION: heightFog + farFog \nMAX: max(heightFog, farFog) \nMULTIPLY: heightFog * farFog \nINVERSE_MULTIPLY: 1 - (1-heightFog) * (1-farFog) \nLIMITED_ADDITION: farFog + max(farFog, heightFog) \nMULTIPLY_ADDITION: farFog + farFog * heightFog \nINVERSE_MULTIPLY_ADDITION: farFog + 1 - (1-heightFog) * (1-farFog) \nAVERAGE: farFog*0.5 + heightFog*0.5 \n\nNote that for 'BASIC' mode and 'IGNORE_HEIGHT' mode, fog settings for height fog has no effect.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMode": + "Height Fog Mode", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMode.@tooltip": + "Where should the height fog be located? \n\nABOVE_CAMERA: Height fog starts from camera to the sky \nBELOW_CAMERA: Height fog starts from camera to the void \nABOVE_AND_BELOW_CAMERA: Height fog starts from camera to both the sky and the void \nABOVE_SET_HEIGHT: Height fog starts from a set height to the sky \nBELOW_SET_HEIGHT: Height fog starts from a set height to the void \nABOVE_AND_BELOW_SET_HEIGHT: Height fog starts from a set height to both the sky and the void \n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogBaseHeight": + "Height Fog Base Height", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogBaseHeight.@tooltip": + "If the height fog is calculated around a set height, what is that height position? ", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogStart": + "Height Fog Start", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogStart.@tooltip": + "How far the start of height fog should offset? \n\n '0.0': Fog start with no offset.\n '1.0': Fog start with offset of the entire world's height. (Include depth)\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogEnd": + "Height Fog End", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogEnd.@tooltip": + "How far the end of height fog should offset? \n\n '0.0': Fog end with no offset.\n '1.0': Fog end with offset of the entire world's height. (Include depth)\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMin": + "Height Fog Min", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMin.@tooltip": + "What is the minimum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMax": + "Height Fog Max", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMax.@tooltip": + "What is the maximum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogFalloff": + "Height Fog Falloff", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogFalloff.@tooltip": + "How should the height fog thickness should be calculated? \n\nLINEAR: Linear based on height (will ignore 'density')\nEXPONENTIAL: 1/(e^(height*density)) \nEXPONENTIAL_SQUARED: 1/(e^((height*density)^2) \n", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogDensity": + "Height Fog Density", + "distanthorizons.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogDensity.@tooltip": + "What is the height fog's density? ", + + + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings": + "Noise Texture", + + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseEnabled": + "Enable Noise Texture", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseEnabled.@tooltip": + "If enabled a noise texture will be applied to LODs to simulate textures.", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseSteps": + "Noise Steps", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseSteps.@tooltip": + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseSteps.@tooltip", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseIntensity": + "Noise Intensity", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseIntensity.@tooltip": + "Determines how intense the noise texture is.", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseDropoff": + "Noise Dropoff", + "distanthorizons.config.client.advanced.graphics.noiseTextureSettings.noiseDropoff.@tooltip": + "How far should the noise texture render before it fades away? \n\n0.0 - the noise texture will render the entire LOD render distance. \n3.0 - the noise texture will fade away at 1/3 of the LOD render distance. ", + + + "distanthorizons.config.client.advanced.graphics.advancedGraphics": + "Advanced Graphics Options", + + "distanthorizons.config.client.advanced.graphics.advancedGraphics.overdrawPrevention": + "Overdraw Prevention", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.overdrawPrevention.@tooltip": + "Enabling this will prevent some overdraw issues,\nbut may cause nearby LODs to render incorrectly, especially when near fancy leaves or non-full blocks.\nLess noticeable with a longer vanilla render distance.", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.brightnessMultiplier": + "Brightness Multiplier", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.brightnessMultiplier.@tooltip": + "How bright LOD colors are.\n\n0 = black \n1 = normal \n2 = near white", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.saturationMultiplier": + "Saturation Multiplier", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.saturationMultiplier.@tooltip": + "How saturated LOD colors are.\n\n0 = black and white \n1 = normal \n2 = vibrant", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.enableCaveCulling": + "Cave Culling", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.enableCaveCulling.@tooltip": + "If enabled caves will be culled \n\nAdditional Info: Currently this cull all faces \n with skylight value of 0 under the cave culling height in dimensions that \n do not have a ceiling. \n", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.caveCullingHeight": + "Cave Culling Height", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.caveCullingHeight.@tooltip": + "At what Y value should cave culling start?", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.earthCurveRatio": + "Earth Curve Ratio §6(EXPERIMENTAL)§r", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.earthCurveRatio.@tooltip": + "A value of 1 is equivalent to the curvature of Earth in real life.", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.lodBias": + "LOD Bias §6(Effects vanilla terrain)§r", + "distanthorizons.config.client.advanced.graphics.advancedGraphics.lodBias.@tooltip": + "Sets vanilla's lod bias value\nPlease press F3+T to reload the texture packs and apply this effect", + + + "distanthorizons.config.client.advanced.worldGenerator": + "World Generator", + + "distanthorizons.config.client.advanced.worldGenerator.enableDistantGeneration": + "Enable Distant Generation", + "distanthorizons.config.client.advanced.worldGenerator.enableDistantGeneration.@tooltip": + "§6True:§r in single player LODs will be generated outside the vanilla render distance.\nNote: this can use a large amount of CPU.\n\n§6False:§r LODs will only generate within the vanilla render distance.", + "distanthorizons.config.client.advanced.worldGenerator.distantGeneratorMode": + "Distance Generator Mode", + "distanthorizons.config.client.advanced.worldGenerator.distantGeneratorMode.@tooltip": + "How complicated the generation should be when generating LODs outside the vanilla render distance.\n\n§6§6Fastest:§r Biome only\n§6Best Quality:§r Features (suggested)", + "distanthorizons.config.client.advanced.worldGenerator.lightingEngine": + "Lighting Engine", + "distanthorizons.config.client.advanced.worldGenerator.lightingEngine.@tooltip": + "§6Minecraft:§r use Minecraft's lighting engine, gives accurate lighting.\n§6Distant Horizons:§r estimates lighting, shadows won't be as smooth, but is more stable.\n\nIf the LODs appear black, set this to §6Distant Horizons§r.", + "distanthorizons.config.client.advanced.worldGenerator.generationPriority": + "Generation Priority", + "distanthorizons.config.client.advanced.worldGenerator.generationPriority.@tooltip": + "The priority for chunks being generated around the player.", + + + "distanthorizons.config.client.advanced.multiplayer": + "Multiplayer", + + "distanthorizons.config.client.advanced.multiplayer.serverFolderNameMode": + "Server Folder Mode", + "distanthorizons.config.client.multiplayer.serverFolderNameMode.@tooltip": + "Determines the folder format for local multiplayer data.\n\n§6Name Only:§r\nUses the server browser name. Ex: \"Minecraft Server\"\n§6Name IP:§r\n\"Minecraft Server, IP 192.168.1.40\"\n§6Name, IP, Port:§r\n\"Minecraft Server, IP 192.168.1.40:25565\"\n§6Name, IP, Port, MC Version:§r\n\"Minecraft Server, IP 192.168.1.40:25565, GameVersion 1.18.1\"\n\n§c§lCaution:§r changing while connected to a multiplayer server may cause glitches.", + "distanthorizons.config.client.advanced.multiplayer.multiverseSimilarityRequiredPercent": + "Multiverse Required Similarity %", + "distanthorizons.config.client.advanced.multiplayer.multiverseSimilarityRequiredPercent.@tooltip": + "When matching worlds of the same dimension type the\ntested chunk(s) must be at least this percent the same\nin order to be considered the same world.\n\nNote: If you use portals to enter a dimension at two\ndifferent locations this system may think it is two different worlds.\n\n§61.0:§r the chunks must be identical.\n§60.5:§r the chunks must be half the same.\n§60.0:§r disables multi-dimension support\n only one world will be used per dimension.", + + + + "distanthorizons.config.client.advanced.multiThreading": + "Threading", + + "distanthorizons.config.client.advanced.multiThreading.numberOfWorldGenerationThreads": + "NO. of world generation threads", + "distanthorizons.config.client.advanced.multiThreading.numberOfWorldGenerationThreads.@tooltip": + "How many threads should be used when generating LODs \n outside the normal render distance? \n\nIf it this is less than 1, it will be treated as a percentage \nof time a single thread can run before going idle. \n\nIf you experience stuttering when generating distant LODs, \ndecrease this number. If you want to increase LOD \ngeneration speed, increase this number. \n\nThis and the number of buffer builder threads are independent, \nif they add up to more threads than your CPU has cores \nthat is ok.", + "distanthorizons.config.client.advanced.multiThreading.numberOfBufferBuilderThreads": + "NO. of buffer builder threads", + "distanthorizons.config.client.advanced.multiThreading.numberOfBufferBuilderThreads.@tooltip": + "The number of threads used when building geometry data. \nCan only be between 1 and your CPU's processor count.", + "distanthorizons.config.client.advanced.multiThreading.numberOfFileHandlerThreads": + "NO. of file handler threads", + "distanthorizons.config.client.advanced.multiThreading.numberOfFileHandlerThreads.@tooltip": + "The number of threads used when building vertex buffers \n(The things sent to your GPU to draw the LODs). \nCan only be between 1 and your CPU's processor count.", + "distanthorizons.config.client.advanced.multiThreading.numberOfDataConverterThreads": + "NO. of data converter threads", + "distanthorizons.config.client.advanced.multiThreading.numberOfDataConverterThreads.@tooltip": + "The number of threads used when converting ID data to render-able data. \n(This generally happens when generating new terrain or changing graphics settings). \nCan only be between 1 and your CPU's processor count.", + "distanthorizons.config.client.advanced.multiThreading.numberOfChunkLodConverterThreads": + "NO. of chunk LOD converter threads", + "distanthorizons.config.client.advanced.multiThreading.numberOfChunkLodConverterThreads.@tooltip": + "How many threads should be used to convert Minecraft chunks into LOD data? \nThese threads run both when terrain is generated and when \nchunks are loaded, unloaded, and modified.", + + + + "distanthorizons.config.client.advanced.debugging": + "Debug", + + "distanthorizons.config.client.advanced.debugging.rendererMode": + "Renderer mode", + "distanthorizons.config.client.advanced.debugging.debugMode": + "Debug mode", + "distanthorizons.config.client.advanced.debugging.debugMode.@tooltip": + "The active debug mode.", + "distanthorizons.config.client.advanced.debugging.renderWireframe": + "Render Wireframe", + "distanthorizons.config.client.advanced.debugging.renderWireframe.@tooltip": + "If enabled the LODs will render as wireframe.", + "distanthorizons.config.client.advanced.debugging.enableDebugKeybindings": + "Enable debug keybindings", + "distanthorizons.config.client.advanced.debugging.enableDebugKeybindings.@tooltip": + "§6True:§r debug keybindings can be used to change the Debug mode in game.", + "distanthorizons.config.client.advanced.debugging.lodOnlyMode": + "Only Render LODs", + "distanthorizons.config.client.advanced.debugging.lodOnlyMode.@tooltip": + "If enabled this will disable (most) vanilla Minecraft rendering. \n\nNOTE: Do not report any issues when this mode is on! \nThis setting is only for fun and debugging. \nMod compatibility is not guaranteed.", + "distanthorizons.config.client.advanced.debugging.debugWireframeRendering": + "Enable Debug Wireframe Rendering", + "distanthorizons.config.client.advanced.debugging.debugWireframeRendering.@tooltip": + "If enabled, various wireframes for debugging internal functions will be drawn.", + + "distanthorizons.config.client.advanced.buffers": + "Buffers", + "distanthorizons.config.client.advanced.buffers.gpuUploadMethod": + "GPU upload method", + "distanthorizons.config.client.advanced.buffers.gpuUploadMethod.@tooltip": + "The method for uploading geometry to the GPU.\n\nIf you experience stuttering while your CPU and GPU usage is low, try changing this setting.\nNote: if you are in a world you may have to leaving and rejoin to see the full effect.", + "distanthorizons.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds": + "GPU upload speed (milliseconds)", + "distanthorizons.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds.@tooltip": + "How long should a buffer wait per Megabyte of data uploaded?\nMay be increased if there is frame stuttering.", + + + + "distanthorizons.config.client.advanced.autoUpdater": + "Auto Updater", + "distanthorizons.config.client.advanced.autoUpdater.enableAutoUpdater": + "Enable automatic updates", + "distanthorizons.config.client.advanced.autoUpdater.enableSilentUpdates": + "Enable Silent Updates", + "distanthorizons.config.client.advanced.autoUpdater.enableSilentUpdates.@tooltip": + "Automatically updates the mod when an update is available", + + + + "distanthorizons.config.client.advanced.logging": + "Logging", + "distanthorizons.config.client.advanced.logging.@tooltip": + "Controls how logging should be handled.", + + "distanthorizons.config.client.advanced.logging.logWorldGenEvent": + "World Gen Events", + "distanthorizons.config.client.advanced.logging.logWorldGenPerformance": + "World Gen Performance", + "distanthorizons.config.client.advanced.logging.logWorldGenLoadEvent": + "World Gen Load Events", + "distanthorizons.config.client.advanced.logging.logLodBuilderEvent": + "Lod Builder Events", + "distanthorizons.config.client.advanced.logging.logRendererBufferEvent": + "Renderer Buffer Events", + "distanthorizons.config.client.advanced.logging.logRendererGLEvent": + "OpenGL Events", + "distanthorizons.config.client.advanced.logging.logFileReadWriteEvent": + "File Read/Write Events", + "distanthorizons.config.client.advanced.logging.logFileSubDimEvent": + "File Sub Dimension Events", + "distanthorizons.config.client.advanced.logging.logNetworkEvent": + "Network Events", + + + + "distanthorizons.config.client.advanced.debugging.debugConfigScreen": + "Debug Config Screen", + + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.debugConfigScreenNote": + "This screen is to debug features of the config screen", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.boolTest": + "Boolean test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.byteTest": + "Byte test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.intTest": + "Integer test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.doubleTest": + "Double test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.shortTest": + "Short test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.longTest": + "Long test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.floatTest": + "Float test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.stringTest": + "String test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.listTest": + "List (ArrayList) test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.mapTest": + "Map (HashMap) test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.categoryTest": + "Category test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.linkableTest": + "Linkable test", + "distanthorizons.config.client.advanced.debugging.debugConfigScreen.linkableTest.@tooltip": + "The value of this should be the same as in Category Test", + + + "distanthorizons.config.client.resetSettingsConfirmation": + "Reset All Settings?", + + "distanthorizons.config.client.resetSettingsConfirmation.resetConfirmationNote": + "Are you sure? This cannot be undone.", + "distanthorizons.config.client.resetSettingsConfirmation.resetAllSettings": + "Reset All Settings", + + + + "distanthorizons.config.enum.EQualityPreset.CUSTOM": + "Custom", + "distanthorizons.config.enum.EQualityPreset.MINIMUM": + "Minimum", + "distanthorizons.config.enum.EQualityPreset.LOW": + "Low", + "distanthorizons.config.enum.EQualityPreset.MEDIUM": + "Medium", + "distanthorizons.config.enum.EQualityPreset.HIGH": + "High", + "distanthorizons.config.enum.EQualityPreset.EXTREME": + "Extreme", + + "distanthorizons.config.enum.EThreadPreset.CUSTOM": + "Custom", + "distanthorizons.config.enum.EThreadPreset.MINIMAL_IMPACT": + "Minimal Impact", + "distanthorizons.config.enum.EThreadPreset.LOW_IMPACT": + "Low Impact", + "distanthorizons.config.enum.EThreadPreset.BALANCED": + "Balanced", + "distanthorizons.config.enum.EThreadPreset.AGGRESSIVE": + "Aggressive", + "distanthorizons.config.enum.EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU": + "I Paid For The Whole CPU", + + "distanthorizons.config.enum.EMaxHorizontalResolution.BLOCK": + "Block", + "distanthorizons.config.enum.EMaxHorizontalResolution.TWO_BLOCKS": + "2 blocks", + "distanthorizons.config.enum.EMaxHorizontalResolution.FOUR_BLOCKS": + "4 blocks", + "distanthorizons.config.enum.EMaxHorizontalResolution.HALF_CHUNK": + "Half a chunk", + "distanthorizons.config.enum.EMaxHorizontalResolution.CHUNK": + "Chunk", + + "distanthorizons.config.enum.EVerticalQuality.HEIGHT_MAP": + "Height Map", + "distanthorizons.config.enum.EVerticalQuality.LOW": + "Low", + "distanthorizons.config.enum.EVerticalQuality.MEDIUM": + "Medium", + "distanthorizons.config.enum.EVerticalQuality.HIGH": + "High", + "distanthorizons.config.enum.EVerticalQuality.EXTREME": + "Extreme", + "distanthorizons.config.enum.EHorizontalQuality.LOWEST": + "Lowest", + "distanthorizons.config.enum.EHorizontalQuality.LOW": + "Low", + "distanthorizons.config.enum.EHorizontalQuality.MEDIUM": + "Medium", + "distanthorizons.config.enum.EHorizontalQuality.HIGH": + "High", + "distanthorizons.config.enum.EHorizontalQuality.EXTREME": + "Extreme", + "distanthorizons.config.enum.EHorizontalQuality.UNLIMITED": + "Unlimited", + + "distanthorizons.config.enum.ETransparency.DISABLED": + "Disabled", + "distanthorizons.config.enum.ETransparency.FAKE": + "Fake", + "distanthorizons.config.enum.ETransparency.COMPLETE": + "Complete", + + "distanthorizons.config.enum.EFogDistance.NEAR": + "Near", + "distanthorizons.config.enum.EFogDistance.FAR": + "Far", + "distanthorizons.config.enum.EFogDistance.NEAR_AND_FAR": + "Near and far", + + "distanthorizons.config.enum.EFogDrawMode.USE_OPTIFINE_SETTING": + "Use modded settings", + "distanthorizons.config.enum.EFogDrawMode.FOG_ENABLED": + "Enabled", + "distanthorizons.config.enum.EFogDrawMode.FOG_DISABLED": + "Disabled", + "distanthorizons.config.enum.EFogColorMode.USE_WORLD_FOG_COLOR": + "Use world fog", + "distanthorizons.config.enum.EFogColorMode.USE_SKY_COLOR": + "Use sky color", + + "distanthorizons.config.enum.EFogFalloff.LINEAR": + "Linear", + "distanthorizons.config.enum.EFogFalloff.EXPONENTIAL": + "Exponential", + "distanthorizons.config.enum.EFogFalloff.EXPONENTIAL_SQUARED": + "Exponential squared", + + "distanthorizons.config.enum.EHeightFogMixMode.BASIC": + "Basic", + "distanthorizons.config.enum.EHeightFogMixMode.IGNORE_HEIGHT": + "Ignore Height", + "distanthorizons.config.enum.EHeightFogMixMode.ADDITION": + "Addition", + "distanthorizons.config.enum.EHeightFogMixMode.MAX": + "Max", + "distanthorizons.config.enum.EHeightFogMixMode.MULTIPLY": + "Multiply", + "distanthorizons.config.enum.EHeightFogMixMode.INVERSE_MULTIPLY": + "Inverse Multiply", + "distanthorizons.config.enum.EHeightFogMixMode.LIMITED_ADDITION": + "Limited Addition", + "distanthorizons.config.enum.EHeightFogMixMode.MULTIPLY_ADDITION": + "Multiply Addition", + "distanthorizons.config.enum.EHeightFogMixMode.INVERSE_MULTIPLY_ADDITION": + "Inverse Multiply Addition", + "distanthorizons.config.enum.EHeightFogMixMode.AVERAGE": + "Average", + + "distanthorizons.config.enum.EHeightFogMode.ABOVE_CAMERA": + "Above Camera", + "distanthorizons.config.enum.EHeightFogMode.BELOW_CAMERA": + "Below Camera", + "distanthorizons.config.enum.EHeightFogMode.ABOVE_AND_BELOW_CAMERA": + "Above And Below Camera", + "distanthorizons.config.enum.EHeightFogMode.ABOVE_SET_HEIGHT": + "Above Set Height", + "distanthorizons.config.enum.EHeightFogMode.BELOW_SET_HEIGHT": + "Below Set Height", + "distanthorizons.config.enum.EHeightFogMode.ABOVE_AND_BELOW_SET_HEIGHT": + "Above And Below Set Height", + + "distanthorizons.config.enum.EVanillaOverdraw.NEVER": + "Never", + "distanthorizons.config.enum.EVanillaOverdraw.DYNAMIC": + "Dynamic", + "distanthorizons.config.enum.EVanillaOverdraw.ALWAYS": + "Always", + + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.NONE": + "Existing Only", + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.PRE_EXISTING_ONLY": + "Pre-Existing Chunks only", + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.BIOME_ONLY": + "Biome only", + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.BIOME_ONLY_SIMULATE_HEIGHT": + "Biome only simulate height", + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.SURFACE": + "Surface", + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.FEATURES": + "Features", + "distanthorizons.config.enum.EDhApiDistantGeneratorMode.FULL": + "Full", + + "distanthorizons.config.enum.ELightGenerationMode.DISTANT_HORIZONS": + "Distant Horizons", + "distanthorizons.config.enum.ELightGenerationMode.MINECRAFT": + "Minecraft", + + "distanthorizons.config.enum.EGenerationPriority.AUTO": + "Auto", + "distanthorizons.config.enum.EGenerationPriority.NEAR_FIRST": + "Near first", + "distanthorizons.config.enum.EGenerationPriority.BALANCED": + "Balanced", + "distanthorizons.config.enum.EGenerationPriority.FAR_FIRST": + "Far first", + + "distanthorizons.config.enum.EBlocksToAvoid.NONE": + "None", + "distanthorizons.config.enum.EBlocksToAvoid.NON_COLLIDING": + "Non-Colliding", + + "distanthorizons.config.enum.EOverdrawPrevention.NONE": + "None", + "distanthorizons.config.enum.EOverdrawPrevention.LIGHT": + "Light", + "distanthorizons.config.enum.EOverdrawPrevention.MEDIUM": + "Medium", + "distanthorizons.config.enum.EOverdrawPrevention.HEAVY": + "Heavy", + + "distanthorizons.config.enum.EServerFolderNameMode.NAME_ONLY": + "Name Only", + "distanthorizons.config.enum.EServerFolderNameMode.NAME_IP": + "Name and IP", + "distanthorizons.config.enum.EServerFolderNameMode.NAME_IP_PORT": + "Name, IP, Port", + "distanthorizons.config.enum.EServerFolderNameMode.NAME_IP_PORT_MC_VERSION": + "Name, IP, Port, MC version", + + "distanthorizons.config.enum.ERendererMode.DEFAULT": + "Default", + "distanthorizons.config.enum.ERendererMode.DEBUG": + "Debug", + "distanthorizons.config.enum.ERendererMode.DISABLED": + "Disabled", + + "distanthorizons.config.enum.EDebugRendering.OFF": + "Off", + "distanthorizons.config.enum.EDebugRendering.SHOW_DETAIL": + "Show detail", + "distanthorizons.config.enum.EDebugRendering.SHOW_GENMODE": + "Show generation mode", + "distanthorizons.config.enum.EDebugRendering.SHOW_OVERLAPPING_QUADS": + "Show overlapping quads", + "distanthorizons.config.enum.EDebugRendering.SHOW_RENDER_SOURCE_FLAG": + "Show render source flag", + + "distanthorizons.config.enum.ELoggerMode.DISABLED": + "Disabled", + "distanthorizons.config.enum.ELoggerMode.LOG_ALL_TO_FILE": + "File: All, Chat: Off", + "distanthorizons.config.enum.ELoggerMode.LOG_ERROR_TO_CHAT": + "File: All, Chat: Error", + "distanthorizons.config.enum.ELoggerMode.LOG_WARNING_TO_CHAT": + "File: All, Chat: Warning", + "distanthorizons.config.enum.ELoggerMode.LOG_INFO_TO_CHAT": + "File: All, Chat: Info", + "distanthorizons.config.enum.ELoggerMode.LOG_DEBUG_TO_CHAT": + "File: All, Chat: Debug", + "distanthorizons.config.enum.ELoggerMode.LOG_ALL_TO_CHAT": + "File: All, Chat: All", + "distanthorizons.config.enum.ELoggerMode.LOG_ERROR_TO_CHAT_AND_FILE": + "File: Error, Chat: Error", + "distanthorizons.config.enum.ELoggerMode.LOG_WARNING_TO_CHAT_AND_FILE": + "File: Warning, Chat: Warning", + "distanthorizons.config.enum.ELoggerMode.LOG_INFO_TO_CHAT_AND_FILE": + "File: Info, Chat: Info", + "distanthorizons.config.enum.ELoggerMode.LOG_DEBUG_TO_CHAT_AND_FILE": + "File: Debug, Chat: Debug", + "distanthorizons.config.enum.ELoggerMode.LOG_WARNING_TO_CHAT_AND_INFO_TO_FILE": + "File: Info, Chat: Warning", + "distanthorizons.config.enum.ELoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE": + "File: Info, Chat: Error", + + "distanthorizons.config.enum.EGpuUploadMethod.AUTO": + "Auto", + "distanthorizons.config.enum.EGpuUploadMethod.BUFFER_STORAGE": + "Buffer storage", + "distanthorizons.config.enum.EGpuUploadMethod.SUB_DATA": + "Sub data", + "distanthorizons.config.enum.EGpuUploadMethod.BUFFER_MAPPING": + "Buffer mapping", + "distanthorizons.config.enum.EGpuUploadMethod.DATA": + "Data", + + "distanthorizons.config.enum.EBufferRebuildTimes.CONSTANT": + "Constant", + "distanthorizons.config.enum.EBufferRebuildTimes.FREQUENT": + "Frequent", + "distanthorizons.config.enum.EBufferRebuildTimes.NORMAL": + "Normal", + "distanthorizons.config.enum.EBufferRebuildTimes.RARE": + "Rare" +} diff --git a/core/src/main/resources/assets/lod/textures/gui/button.png b/core/src/main/resources/assets/distanthorizons/textures/gui/button.png similarity index 100% rename from core/src/main/resources/assets/lod/textures/gui/button.png rename to core/src/main/resources/assets/distanthorizons/textures/gui/button.png diff --git a/core/src/main/resources/assets/lod/textures/gui/changelog.png b/core/src/main/resources/assets/distanthorizons/textures/gui/changelog.png similarity index 100% rename from core/src/main/resources/assets/lod/textures/gui/changelog.png rename to core/src/main/resources/assets/distanthorizons/textures/gui/changelog.png diff --git a/core/src/main/resources/assets/lod/textures/jar/themeDark.svg b/core/src/main/resources/assets/distanthorizons/textures/jar/themeDark.svg similarity index 100% rename from core/src/main/resources/assets/lod/textures/jar/themeDark.svg rename to core/src/main/resources/assets/distanthorizons/textures/jar/themeDark.svg diff --git a/core/src/main/resources/assets/lod/textures/jar/themeLight.svg b/core/src/main/resources/assets/distanthorizons/textures/jar/themeLight.svg similarity index 100% rename from core/src/main/resources/assets/lod/textures/jar/themeLight.svg rename to core/src/main/resources/assets/distanthorizons/textures/jar/themeLight.svg diff --git a/core/src/main/resources/assets/lod/textures/null.svg b/core/src/main/resources/assets/distanthorizons/textures/null.svg similarity index 100% rename from core/src/main/resources/assets/lod/textures/null.svg rename to core/src/main/resources/assets/distanthorizons/textures/null.svg diff --git a/core/src/main/resources/assets/lod/lang/en_us.json b/core/src/main/resources/assets/lod/lang/en_us.json deleted file mode 100644 index 91dfcc264..000000000 --- a/core/src/main/resources/assets/lod/lang/en_us.json +++ /dev/null @@ -1,692 +0,0 @@ -{ - "lod.title": - "Distant Horizons", - - - - "lod.general.back": - "Back", - "lod.general.next": - "Next", - "lod.general.done": - "Done", - "lod.general.cancel": - "Cancel", - "lod.general.yes": - "Yes", - "lod.general.no": - "No", - - - - - "lod.updater.title": - "Distant Horizons auto updater", - "lod.updater.text1": - "§lNew update available!", - "lod.updater.text2": - "§fDo you want to update from %s§f to %s§f?", - "lod.updater.later": - "Not now", - "lod.updater.never": - "Don't show again", - "lod.updater.update": - "Update", - "lod.updater.update.@tooltip": - "Updates the mod this 1 time\n(Updates when game closed)", - "lod.updater.silent": - "Always silent update", - "lod.updater.silent.@tooltip": - "Every time an update is available, it would update\n(§6WARNING§r: It wont prompt the user on an update, tough it would keep the mod up to date)", - "lod.updater.waitingForClose": - "Distant Horizons will finish update once game restarts", - - - - - "lod.config.title": - "Distant Horizons config", - "lod.config.client": - "Client", - - "lod.config.client.quickEnableRendering": - "Enable Rendering", - "lod.config.client.quickEnableRendering.@tooltip": - "Determines if Distant Horizons Renders LODs.", - - "lod.config.client.qualityPresetSetting": - "Quality Preset", - "lod.config.client.qualityPresetSetting.@tooltip": - "Modifies a number of graphical settings to quickly change Distant Horizons' rendering quality. \n\nLower this setting if your GPU is at max usage or you are having framerate issues.", - "lod.config.client.threadPresetSetting": - "CPU Load", - "lod.config.client.threadPresetSetting.@tooltip": - "Modifies how many threads Distant Horizons' will use. \n\nIncreasing this setting will improve the Distant Generator speed and LOD loading speed, \nbut will also increase CPU/memory usage and may introduce stuttering. \n\nNote: on CPUs with 4 cores or less these settings will be less effective \nand some settings will give similar results.", - - "lod.config.client.optionsButton": - "Show The Options Button", - "lod.config.client.optionsButton.@tooltip": - "Show the config button to the left of the fov button", - - - - "lod.config.client.advanced": - "Advanced options", - - "lod.config.client.advanced.graphics": - "Graphics", - "lod.config.client.advanced.graphics.quality": - "Render Quality", - - "lod.config.client.advanced.graphics.quality.maxHorizontalResolution": - "Max Horizontal Resolution", - "lod.config.client.advanced.graphics.quality.maxHorizontalResolution.@tooltip": - "The maximum detail LODs are rendered at.\n\n§6Fastest:§r Chunk\n§6Fanciest:§r Block", - "lod.config.client.advanced.graphics.quality.lodChunkRenderDistance": - "LOD Render Distance", - "lod.config.client.advanced.graphics.quality.lodChunkRenderDistance.@tooltip": - "Distant Horizons' render distance, measured in chunks. \n\nNote: this is a best effort number. \nThe render distance may be above or below this number \ndepending on your other graphic settings.", - "lod.config.client.advanced.graphics.quality.verticalQuality": - "Vertical Quality", - "lod.config.client.advanced.graphics.quality.verticalQuality.@tooltip": - "How well LODs represent overhangs, caves, cliffsides, etc.\n\nHigher options will increase memory and GPU usage.", - "lod.config.client.advanced.graphics.quality.horizontalScale": - "Horizontal Scale", - "lod.config.client.advanced.graphics.quality.horizontalScale.@tooltip": - "How quickly LODs drop off in quality.\n\nLarger numbers will improve how distant terrain looks\nbut will increase memory and GPU usage.", - "lod.config.client.advanced.graphics.quality.ssao": - "SSAO", - "lod.config.client.advanced.graphics.quality.ssao.@tooltip": - "Screen Space Ambient Occlusion adds depth to the lighting of blocks.", - "lod.config.client.advanced.graphics.quality.horizontalQuality": - "Horizontal Quality", - "lod.config.client.advanced.graphics.quality.horizontalQuality.@tooltip": - "How far apart drops in quality are.\n\nHigher settings will increase the distance between drops\nbut will increase memory and GPU usage.", - "lod.config.client.advanced.graphics.quality.transparency": - "Transparency", - "lod.config.client.advanced.graphics.quality.blocksToIgnore": - "Blocks To Ignore", - "lod.config.client.advanced.graphics.quality.blocksToIgnore.@tooltip": - "Defines the types of blocks to ignore when generating LODs.", - "lod.config.client.advanced.graphics.quality.tintWithAvoidedBlocks": - "Tint With Avoided Blocks", - "lod.config.client.advanced.graphics.quality.tintWithAvoidedBlocks.@tooltip": - "§4Note: makes snow, carpet, and trapdoors look really bad§r\nShould the blocks underneath avoided blocks gain the color of the avoided block?\n§6True:§r a red flower on grass will tint the grass below it red\n§6False:§r skipped blocks will not change color of surface below them", - "lod.config.client.advanced.graphics.quality.lodBiomeBlending": - "Biome Blending", - "lod.config.client.advanced.graphics.quality.lodBiomeBlending.@tooltip": - "This is the same as vanilla Biome Blending settings for LOD area. \n\nNote that anything other than '0' will greatly effect Lod building time\nand increase triangle count. The cost on chunk generation speed is also \nquite large if set to too high.\n\n'0' equals to Vanilla Biome Blending of '1x1', \n'1' equals to Vanilla Biome Blending of '3x3', \n'2' equals to Vanilla Biome Blending of '5x5'... \n", - - - "lod.config.client.advanced.graphics.fog": - "Fog", - - "lod.config.client.advanced.graphics.fog.drawMode": - "Fog Draw Mode", - "lod.config.client.advanced.graphics.fog.drawMode.@tooltip": - "When fog will be rendered on the LODs.", - "lod.config.client.advanced.graphics.fog.distance": - "Fog Distance", - "lod.config.client.advanced.graphics.fog.distance.@tooltip": - "The distance(s) Fog will be rendered on the LODs.", - "lod.config.client.advanced.graphics.fog.colorMode": - "Fog Color Mode", - "lod.config.client.advanced.graphics.fog.colorMode.@tooltip": - "The color of the fog on LODs.", - "lod.config.client.advanced.graphics.fog.disableVanillaFog": - "Disable Vanilla Fog", - "lod.config.client.advanced.graphics.fog.disableVanillaFog.@tooltip": - "§6True:§r disables Minecraft's fog on vanilla chunks.\n§6False:§r Minecraft renders fog like normal.\n\nMay cause issues with other mods that edit fog.\nDisable if vanilla chunks are completely covered in fog.", - "lod.config.client.advanced.graphics.fog.advancedFog": - "Advanced Fog Options", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogStart": - "Far Fog Start", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogStart.@tooltip": - "Where should the far fog start? \n\n '0.0': Fog start at player's position.\n '1.0': The fog-start's circle fit just in the lod render distance square.\n'1.414': The lod render distance square fit just in the fog-start's circle.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogEnd": - "Far Fog End", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogEnd.@tooltip": - "Where should the far fog end? \n\n '0.0': Fog end at player's position.\n '1.0': The fog-end's circle fit just in the lod render distance square.\n'1.414': The lod render distance square fit just in the fog-end's circle.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogMin": - "Far Fog Min", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogMin.@tooltip": - "What is the minimum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogMax": - "Far Fog Max", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogMax.@tooltip": - "What is the maximum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogFalloff": - "Far Fog Falloff", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogFalloff.@tooltip": - "How should the fog thickness should be calculated? \n\nLINEAR: Linear based on distance (will ignore 'density')\nEXPONENTIAL: 1/(e^(distance*density)) \nEXPONENTIAL_SQUARED: 1/(e^((distance*density)^2) \n", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogDensity": - "Far Fog Density", - "lod.config.client.advanced.graphics.fog.advancedFog.farFogDensity.@tooltip": - "What is the fog density? ", - - - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog": - "Height Fog Options", - - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMixMode": - "Height Fog Mix Mode", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMixMode.@tooltip": - "How the height should effect the fog thickness combined with the normal function? \n\nBASIC: No special height fog effect. Fog is calculated based on camera distance \nIGNORE_HEIGHT: Ignore height completely. Fog is calculated based on horizontal distance \nADDITION: heightFog + farFog \nMAX: max(heightFog, farFog) \nMULTIPLY: heightFog * farFog \nINVERSE_MULTIPLY: 1 - (1-heightFog) * (1-farFog) \nLIMITED_ADDITION: farFog + max(farFog, heightFog) \nMULTIPLY_ADDITION: farFog + farFog * heightFog \nINVERSE_MULTIPLY_ADDITION: farFog + 1 - (1-heightFog) * (1-farFog) \nAVERAGE: farFog*0.5 + heightFog*0.5 \n\nNote that for 'BASIC' mode and 'IGNORE_HEIGHT' mode, fog settings for height fog has no effect.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMode": - "Height Fog Mode", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMode.@tooltip": - "Where should the height fog be located? \n\nABOVE_CAMERA: Height fog starts from camera to the sky \nBELOW_CAMERA: Height fog starts from camera to the void \nABOVE_AND_BELOW_CAMERA: Height fog starts from camera to both the sky and the void \nABOVE_SET_HEIGHT: Height fog starts from a set height to the sky \nBELOW_SET_HEIGHT: Height fog starts from a set height to the void \nABOVE_AND_BELOW_SET_HEIGHT: Height fog starts from a set height to both the sky and the void \n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogBaseHeight": - "Height Fog Base Height", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogBaseHeight.@tooltip": - "If the height fog is calculated around a set height, what is that height position? ", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogStart": - "Height Fog Start", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogStart.@tooltip": - "How far the start of height fog should offset? \n\n '0.0': Fog start with no offset.\n '1.0': Fog start with offset of the entire world's height. (Include depth)\n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogEnd": - "Height Fog End", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogEnd.@tooltip": - "How far the end of height fog should offset? \n\n '0.0': Fog end with no offset.\n '1.0': Fog end with offset of the entire world's height. (Include depth)\n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMin": - "Height Fog Min", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMin.@tooltip": - "What is the minimum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMax": - "Height Fog Max", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogMax.@tooltip": - "What is the maximum fog thickness? \n\n '0.0': No fog at all.\n '1.0': Fully fog color.\n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogFalloff": - "Height Fog Falloff", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogFalloff.@tooltip": - "How should the height fog thickness should be calculated? \n\nLINEAR: Linear based on height (will ignore 'density')\nEXPONENTIAL: 1/(e^(height*density)) \nEXPONENTIAL_SQUARED: 1/(e^((height*density)^2) \n", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogDensity": - "Height Fog Density", - "lod.config.client.advanced.graphics.fog.advancedFog.heightFog.heightFogDensity.@tooltip": - "What is the height fog's density? ", - - - "lod.config.client.advanced.graphics.noiseTextureSettings": - "Noise Texture", - - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseEnabled": - "Enable Noise Texture", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseEnabled.@tooltip": - "If enabled a noise texture will be applied to LODs to simulate textures.", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseSteps": - "Noise Steps", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseSteps.@tooltip": - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseSteps.@tooltip", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseIntensity": - "Noise Intensity", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseIntensity.@tooltip": - "Determines how intense the noise texture is.", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseDropoff": - "Noise Dropoff", - "lod.config.client.advanced.graphics.noiseTextureSettings.noiseDropoff.@tooltip": - "How far should the noise texture render before it fades away? \n\n0.0 - the noise texture will render the entire LOD render distance. \n3.0 - the noise texture will fade away at 1/3 of the LOD render distance. ", - - - "lod.config.client.advanced.graphics.advancedGraphics": - "Advanced Graphics Options", - - "lod.config.client.advanced.graphics.advancedGraphics.overdrawPrevention": - "Overdraw Prevention", - "lod.config.client.advanced.graphics.advancedGraphics.overdrawPrevention.@tooltip": - "Enabling this will prevent some overdraw issues,\nbut may cause nearby LODs to render incorrectly, especially when near fancy leaves or non-full blocks.\nLess noticeable with a longer vanilla render distance.", - "lod.config.client.advanced.graphics.advancedGraphics.brightnessMultiplier": - "Brightness Multiplier", - "lod.config.client.advanced.graphics.advancedGraphics.brightnessMultiplier.@tooltip": - "How bright LOD colors are.\n\n0 = black \n1 = normal \n2 = near white", - "lod.config.client.advanced.graphics.advancedGraphics.saturationMultiplier": - "Saturation Multiplier", - "lod.config.client.advanced.graphics.advancedGraphics.saturationMultiplier.@tooltip": - "How saturated LOD colors are.\n\n0 = black and white \n1 = normal \n2 = vibrant", - "lod.config.client.advanced.graphics.advancedGraphics.enableCaveCulling": - "Cave Culling", - "lod.config.client.advanced.graphics.advancedGraphics.enableCaveCulling.@tooltip": - "If enabled caves will be culled \n\nAdditional Info: Currently this cull all faces \n with skylight value of 0 under the cave culling height in dimensions that \n do not have a ceiling. \n", - "lod.config.client.advanced.graphics.advancedGraphics.caveCullingHeight": - "Cave Culling Height", - "lod.config.client.advanced.graphics.advancedGraphics.caveCullingHeight.@tooltip": - "At what Y value should cave culling start?", - "lod.config.client.advanced.graphics.advancedGraphics.earthCurveRatio": - "Earth Curve Ratio §6(EXPERIMENTAL)§r", - "lod.config.client.advanced.graphics.advancedGraphics.earthCurveRatio.@tooltip": - "A value of 1 is equivalent to the curvature of Earth in real life.", - "lod.config.client.advanced.graphics.advancedGraphics.lodBias": - "LOD Bias §6(Effects vanilla terrain)§r", - "lod.config.client.advanced.graphics.advancedGraphics.lodBias.@tooltip": - "Sets vanilla's lod bias value\nPlease press F3+T to reload the texture packs and apply this effect", - - - "lod.config.client.advanced.worldGenerator": - "World Generator", - - "lod.config.client.advanced.worldGenerator.enableDistantGeneration": - "Enable Distant Generation", - "lod.config.client.advanced.worldGenerator.enableDistantGeneration.@tooltip": - "§6True:§r in single player LODs will be generated outside the vanilla render distance.\nNote: this can use a large amount of CPU.\n\n§6False:§r LODs will only generate within the vanilla render distance.", - "lod.config.client.advanced.worldGenerator.distantGeneratorMode": - "Distance Generator Mode", - "lod.config.client.advanced.worldGenerator.distantGeneratorMode.@tooltip": - "How complicated the generation should be when generating LODs outside the vanilla render distance.\n\n§6§6Fastest:§r Biome only\n§6Best Quality:§r Features (suggested)", - "lod.config.client.advanced.worldGenerator.lightingEngine": - "Lighting Engine", - "lod.config.client.advanced.worldGenerator.lightingEngine.@tooltip": - "§6Minecraft:§r use Minecraft's lighting engine, gives accurate lighting.\n§6Distant Horizons:§r estimates lighting, shadows won't be as smooth, but is more stable.\n\nIf the LODs appear black, set this to §6Distant Horizons§r.", - "lod.config.client.advanced.worldGenerator.generationPriority": - "Generation Priority", - "lod.config.client.advanced.worldGenerator.generationPriority.@tooltip": - "The priority for chunks being generated around the player.", - - - "lod.config.client.advanced.multiplayer": - "Multiplayer", - - "lod.config.client.advanced.multiplayer.serverFolderNameMode": - "Server Folder Mode", - "lod.config.client.multiplayer.serverFolderNameMode.@tooltip": - "Determines the folder format for local multiplayer data.\n\n§6Name Only:§r\nUses the server browser name. Ex: \"Minecraft Server\"\n§6Name IP:§r\n\"Minecraft Server, IP 192.168.1.40\"\n§6Name, IP, Port:§r\n\"Minecraft Server, IP 192.168.1.40:25565\"\n§6Name, IP, Port, MC Version:§r\n\"Minecraft Server, IP 192.168.1.40:25565, GameVersion 1.18.1\"\n\n§c§lCaution:§r changing while connected to a multiplayer server may cause glitches.", - "lod.config.client.advanced.multiplayer.multiverseSimilarityRequiredPercent": - "Multiverse Required Similarity %", - "lod.config.client.advanced.multiplayer.multiverseSimilarityRequiredPercent.@tooltip": - "When matching worlds of the same dimension type the\ntested chunk(s) must be at least this percent the same\nin order to be considered the same world.\n\nNote: If you use portals to enter a dimension at two\ndifferent locations this system may think it is two different worlds.\n\n§61.0:§r the chunks must be identical.\n§60.5:§r the chunks must be half the same.\n§60.0:§r disables multi-dimension support\n only one world will be used per dimension.", - - - - "lod.config.client.advanced.multiThreading": - "Threading", - - "lod.config.client.advanced.multiThreading.numberOfWorldGenerationThreads": - "NO. of world generation threads", - "lod.config.client.advanced.multiThreading.numberOfWorldGenerationThreads.@tooltip": - "How many threads should be used when generating LODs \n outside the normal render distance? \n\nIf it this is less than 1, it will be treated as a percentage \nof time a single thread can run before going idle. \n\nIf you experience stuttering when generating distant LODs, \ndecrease this number. If you want to increase LOD \ngeneration speed, increase this number. \n\nThis and the number of buffer builder threads are independent, \nif they add up to more threads than your CPU has cores \nthat is ok.", - "lod.config.client.advanced.multiThreading.numberOfBufferBuilderThreads": - "NO. of buffer builder threads", - "lod.config.client.advanced.multiThreading.numberOfBufferBuilderThreads.@tooltip": - "The number of threads used when building geometry data. \nCan only be between 1 and your CPU's processor count.", - "lod.config.client.advanced.multiThreading.numberOfFileHandlerThreads": - "NO. of file handler threads", - "lod.config.client.advanced.multiThreading.numberOfFileHandlerThreads.@tooltip": - "The number of threads used when building vertex buffers \n(The things sent to your GPU to draw the LODs). \nCan only be between 1 and your CPU's processor count.", - "lod.config.client.advanced.multiThreading.numberOfDataConverterThreads": - "NO. of data converter threads", - "lod.config.client.advanced.multiThreading.numberOfDataConverterThreads.@tooltip": - "The number of threads used when converting ID data to render-able data. \n(This generally happens when generating new terrain or changing graphics settings). \nCan only be between 1 and your CPU's processor count.", - "lod.config.client.advanced.multiThreading.numberOfChunkLodConverterThreads": - "NO. of chunk LOD converter threads", - "lod.config.client.advanced.multiThreading.numberOfChunkLodConverterThreads.@tooltip": - "How many threads should be used to convert Minecraft chunks into LOD data? \nThese threads run both when terrain is generated and when \nchunks are loaded, unloaded, and modified.", - - - - "lod.config.client.advanced.debugging": - "Debug", - - "lod.config.client.advanced.debugging.rendererMode": - "Renderer mode", - "lod.config.client.advanced.debugging.debugMode": - "Debug mode", - "lod.config.client.advanced.debugging.debugMode.@tooltip": - "The active debug mode.", - "lod.config.client.advanced.debugging.renderWireframe": - "Render Wireframe", - "lod.config.client.advanced.debugging.renderWireframe.@tooltip": - "If enabled the LODs will render as wireframe.", - "lod.config.client.advanced.debugging.enableDebugKeybindings": - "Enable debug keybindings", - "lod.config.client.advanced.debugging.enableDebugKeybindings.@tooltip": - "§6True:§r debug keybindings can be used to change the Debug mode in game.", - "lod.config.client.advanced.debugging.lodOnlyMode": - "Only Render LODs", - "lod.config.client.advanced.debugging.lodOnlyMode.@tooltip": - "If enabled this will disable (most) vanilla Minecraft rendering. \n\nNOTE: Do not report any issues when this mode is on! \nThis setting is only for fun and debugging. \nMod compatibility is not guaranteed.", - "lod.config.client.advanced.debugging.debugWireframeRendering": - "Enable Debug Wireframe Rendering", - "lod.config.client.advanced.debugging.debugWireframeRendering.@tooltip": - "If enabled, various wireframes for debugging internal functions will be drawn.", - - "lod.config.client.advanced.buffers": - "Buffers", - "lod.config.client.advanced.buffers.gpuUploadMethod": - "GPU upload method", - "lod.config.client.advanced.buffers.gpuUploadMethod.@tooltip": - "The method for uploading geometry to the GPU.\n\nIf you experience stuttering while your CPU and GPU usage is low, try changing this setting.\nNote: if you are in a world you may have to leaving and rejoin to see the full effect.", - "lod.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds": - "GPU upload speed (milliseconds)", - "lod.config.client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds.@tooltip": - "How long should a buffer wait per Megabyte of data uploaded?\nMay be increased if there is frame stuttering.", - - - - "lod.config.client.advanced.autoUpdater": - "Auto Updater", - "lod.config.client.advanced.autoUpdater.enableAutoUpdater": - "Enable automatic updates", - "lod.config.client.advanced.autoUpdater.enableSilentUpdates": - "Enable Silent Updates", - "lod.config.client.advanced.autoUpdater.enableSilentUpdates.@tooltip": - "Automatically updates the mod when an update is available", - - - - "lod.config.client.advanced.logging": - "Logging", - "lod.config.client.advanced.logging.@tooltip": - "Controls how logging should be handled.", - - "lod.config.client.advanced.logging.logWorldGenEvent": - "World Gen Events", - "lod.config.client.advanced.logging.logWorldGenPerformance": - "World Gen Performance", - "lod.config.client.advanced.logging.logWorldGenLoadEvent": - "World Gen Load Events", - "lod.config.client.advanced.logging.logLodBuilderEvent": - "Lod Builder Events", - "lod.config.client.advanced.logging.logRendererBufferEvent": - "Renderer Buffer Events", - "lod.config.client.advanced.logging.logRendererGLEvent": - "OpenGL Events", - "lod.config.client.advanced.logging.logFileReadWriteEvent": - "File Read/Write Events", - "lod.config.client.advanced.logging.logFileSubDimEvent": - "File Sub Dimension Events", - "lod.config.client.advanced.logging.logNetworkEvent": - "Network Events", - - - - "lod.config.client.advanced.debugging.debugConfigScreen": - "Debug Config Screen", - - "lod.config.client.advanced.debugging.debugConfigScreen.debugConfigScreenNote": - "This screen is to debug features of the config screen", - "lod.config.client.advanced.debugging.debugConfigScreen.boolTest": - "Boolean test", - "lod.config.client.advanced.debugging.debugConfigScreen.byteTest": - "Byte test", - "lod.config.client.advanced.debugging.debugConfigScreen.intTest": - "Integer test", - "lod.config.client.advanced.debugging.debugConfigScreen.doubleTest": - "Double test", - "lod.config.client.advanced.debugging.debugConfigScreen.shortTest": - "Short test", - "lod.config.client.advanced.debugging.debugConfigScreen.longTest": - "Long test", - "lod.config.client.advanced.debugging.debugConfigScreen.floatTest": - "Float test", - "lod.config.client.advanced.debugging.debugConfigScreen.stringTest": - "String test", - "lod.config.client.advanced.debugging.debugConfigScreen.listTest": - "List (ArrayList) test", - "lod.config.client.advanced.debugging.debugConfigScreen.mapTest": - "Map (HashMap) test", - "lod.config.client.advanced.debugging.debugConfigScreen.categoryTest": - "Category test", - "lod.config.client.advanced.debugging.debugConfigScreen.linkableTest": - "Linkable test", - "lod.config.client.advanced.debugging.debugConfigScreen.linkableTest.@tooltip": - "The value of this should be the same as in Category Test", - - - "lod.config.client.resetSettingsConfirmation": - "Reset All Settings?", - - "lod.config.client.resetSettingsConfirmation.resetConfirmationNote": - "Are you sure? This cannot be undone.", - "lod.config.client.resetSettingsConfirmation.resetAllSettings": - "Reset All Settings", - - - - "lod.config.enum.EQualityPreset.CUSTOM": - "Custom", - "lod.config.enum.EQualityPreset.MINIMUM": - "Minimum", - "lod.config.enum.EQualityPreset.LOW": - "Low", - "lod.config.enum.EQualityPreset.MEDIUM": - "Medium", - "lod.config.enum.EQualityPreset.HIGH": - "High", - "lod.config.enum.EQualityPreset.EXTREME": - "Extreme", - - "lod.config.enum.EThreadPreset.CUSTOM": - "Custom", - "lod.config.enum.EThreadPreset.MINIMAL_IMPACT": - "Minimal Impact", - "lod.config.enum.EThreadPreset.LOW_IMPACT": - "Low Impact", - "lod.config.enum.EThreadPreset.BALANCED": - "Balanced", - "lod.config.enum.EThreadPreset.AGGRESSIVE": - "Aggressive", - "lod.config.enum.EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU": - "I Paid For The Whole CPU", - - "lod.config.enum.EMaxHorizontalResolution.BLOCK": - "Block", - "lod.config.enum.EMaxHorizontalResolution.TWO_BLOCKS": - "2 blocks", - "lod.config.enum.EMaxHorizontalResolution.FOUR_BLOCKS": - "4 blocks", - "lod.config.enum.EMaxHorizontalResolution.HALF_CHUNK": - "Half a chunk", - "lod.config.enum.EMaxHorizontalResolution.CHUNK": - "Chunk", - - "lod.config.enum.EVerticalQuality.HEIGHT_MAP": - "Height Map", - "lod.config.enum.EVerticalQuality.LOW": - "Low", - "lod.config.enum.EVerticalQuality.MEDIUM": - "Medium", - "lod.config.enum.EVerticalQuality.HIGH": - "High", - "lod.config.enum.EVerticalQuality.EXTREME": - "Extreme", - "lod.config.enum.EHorizontalQuality.LOWEST": - "Lowest", - "lod.config.enum.EHorizontalQuality.LOW": - "Low", - "lod.config.enum.EHorizontalQuality.MEDIUM": - "Medium", - "lod.config.enum.EHorizontalQuality.HIGH": - "High", - "lod.config.enum.EHorizontalQuality.EXTREME": - "Extreme", - "lod.config.enum.EHorizontalQuality.UNLIMITED": - "Unlimited", - - "lod.config.enum.ETransparency.DISABLED": - "Disabled", - "lod.config.enum.ETransparency.FAKE": - "Fake", - "lod.config.enum.ETransparency.COMPLETE": - "Complete", - - "lod.config.enum.EFogDistance.NEAR": - "Near", - "lod.config.enum.EFogDistance.FAR": - "Far", - "lod.config.enum.EFogDistance.NEAR_AND_FAR": - "Near and far", - - "lod.config.enum.EFogDrawMode.USE_OPTIFINE_SETTING": - "Use modded settings", - "lod.config.enum.EFogDrawMode.FOG_ENABLED": - "Enabled", - "lod.config.enum.EFogDrawMode.FOG_DISABLED": - "Disabled", - "lod.config.enum.EFogColorMode.USE_WORLD_FOG_COLOR": - "Use world fog", - "lod.config.enum.EFogColorMode.USE_SKY_COLOR": - "Use sky color", - - "lod.config.enum.EFogFalloff.LINEAR": - "Linear", - "lod.config.enum.EFogFalloff.EXPONENTIAL": - "Exponential", - "lod.config.enum.EFogFalloff.EXPONENTIAL_SQUARED": - "Exponential squared", - - "lod.config.enum.EHeightFogMixMode.BASIC": - "Basic", - "lod.config.enum.EHeightFogMixMode.IGNORE_HEIGHT": - "Ignore Height", - "lod.config.enum.EHeightFogMixMode.ADDITION": - "Addition", - "lod.config.enum.EHeightFogMixMode.MAX": - "Max", - "lod.config.enum.EHeightFogMixMode.MULTIPLY": - "Multiply", - "lod.config.enum.EHeightFogMixMode.INVERSE_MULTIPLY": - "Inverse Multiply", - "lod.config.enum.EHeightFogMixMode.LIMITED_ADDITION": - "Limited Addition", - "lod.config.enum.EHeightFogMixMode.MULTIPLY_ADDITION": - "Multiply Addition", - "lod.config.enum.EHeightFogMixMode.INVERSE_MULTIPLY_ADDITION": - "Inverse Multiply Addition", - "lod.config.enum.EHeightFogMixMode.AVERAGE": - "Average", - - "lod.config.enum.EHeightFogMode.ABOVE_CAMERA": - "Above Camera", - "lod.config.enum.EHeightFogMode.BELOW_CAMERA": - "Below Camera", - "lod.config.enum.EHeightFogMode.ABOVE_AND_BELOW_CAMERA": - "Above And Below Camera", - "lod.config.enum.EHeightFogMode.ABOVE_SET_HEIGHT": - "Above Set Height", - "lod.config.enum.EHeightFogMode.BELOW_SET_HEIGHT": - "Below Set Height", - "lod.config.enum.EHeightFogMode.ABOVE_AND_BELOW_SET_HEIGHT": - "Above And Below Set Height", - - "lod.config.enum.EVanillaOverdraw.NEVER": - "Never", - "lod.config.enum.EVanillaOverdraw.DYNAMIC": - "Dynamic", - "lod.config.enum.EVanillaOverdraw.ALWAYS": - "Always", - - "lod.config.enum.EDhApiDistantGeneratorMode.NONE": - "Existing Only", - "lod.config.enum.EDhApiDistantGeneratorMode.PRE_EXISTING_ONLY": - "Pre-Existing Chunks only", - "lod.config.enum.EDhApiDistantGeneratorMode.BIOME_ONLY": - "Biome only", - "lod.config.enum.EDhApiDistantGeneratorMode.BIOME_ONLY_SIMULATE_HEIGHT": - "Biome only simulate height", - "lod.config.enum.EDhApiDistantGeneratorMode.SURFACE": - "Surface", - "lod.config.enum.EDhApiDistantGeneratorMode.FEATURES": - "Features", - "lod.config.enum.EDhApiDistantGeneratorMode.FULL": - "Full", - - "lod.config.enum.ELightGenerationMode.DISTANT_HORIZONS": - "Distant Horizons", - "lod.config.enum.ELightGenerationMode.MINECRAFT": - "Minecraft", - - "lod.config.enum.EGenerationPriority.AUTO": - "Auto", - "lod.config.enum.EGenerationPriority.NEAR_FIRST": - "Near first", - "lod.config.enum.EGenerationPriority.BALANCED": - "Balanced", - "lod.config.enum.EGenerationPriority.FAR_FIRST": - "Far first", - - "lod.config.enum.EBlocksToAvoid.NONE": - "None", - "lod.config.enum.EBlocksToAvoid.NON_COLLIDING": - "Non-Colliding", - - "lod.config.enum.EOverdrawPrevention.NONE": - "None", - "lod.config.enum.EOverdrawPrevention.LIGHT": - "Light", - "lod.config.enum.EOverdrawPrevention.MEDIUM": - "Medium", - "lod.config.enum.EOverdrawPrevention.HEAVY": - "Heavy", - - "lod.config.enum.EServerFolderNameMode.NAME_ONLY": - "Name Only", - "lod.config.enum.EServerFolderNameMode.NAME_IP": - "Name and IP", - "lod.config.enum.EServerFolderNameMode.NAME_IP_PORT": - "Name, IP, Port", - "lod.config.enum.EServerFolderNameMode.NAME_IP_PORT_MC_VERSION": - "Name, IP, Port, MC version", - - "lod.config.enum.ERendererMode.DEFAULT": - "Default", - "lod.config.enum.ERendererMode.DEBUG": - "Debug", - "lod.config.enum.ERendererMode.DISABLED": - "Disabled", - - "lod.config.enum.EDebugRendering.OFF": - "Off", - "lod.config.enum.EDebugRendering.SHOW_DETAIL": - "Show detail", - "lod.config.enum.EDebugRendering.SHOW_GENMODE": - "Show generation mode", - "lod.config.enum.EDebugRendering.SHOW_OVERLAPPING_QUADS": - "Show overlapping quads", - "lod.config.enum.EDebugRendering.SHOW_RENDER_SOURCE_FLAG": - "Show render source flag", - - "lod.config.enum.ELoggerMode.DISABLED": - "Disabled", - "lod.config.enum.ELoggerMode.LOG_ALL_TO_FILE": - "File: All, Chat: Off", - "lod.config.enum.ELoggerMode.LOG_ERROR_TO_CHAT": - "File: All, Chat: Error", - "lod.config.enum.ELoggerMode.LOG_WARNING_TO_CHAT": - "File: All, Chat: Warning", - "lod.config.enum.ELoggerMode.LOG_INFO_TO_CHAT": - "File: All, Chat: Info", - "lod.config.enum.ELoggerMode.LOG_DEBUG_TO_CHAT": - "File: All, Chat: Debug", - "lod.config.enum.ELoggerMode.LOG_ALL_TO_CHAT": - "File: All, Chat: All", - "lod.config.enum.ELoggerMode.LOG_ERROR_TO_CHAT_AND_FILE": - "File: Error, Chat: Error", - "lod.config.enum.ELoggerMode.LOG_WARNING_TO_CHAT_AND_FILE": - "File: Warning, Chat: Warning", - "lod.config.enum.ELoggerMode.LOG_INFO_TO_CHAT_AND_FILE": - "File: Info, Chat: Info", - "lod.config.enum.ELoggerMode.LOG_DEBUG_TO_CHAT_AND_FILE": - "File: Debug, Chat: Debug", - "lod.config.enum.ELoggerMode.LOG_WARNING_TO_CHAT_AND_INFO_TO_FILE": - "File: Info, Chat: Warning", - "lod.config.enum.ELoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE": - "File: Info, Chat: Error", - - "lod.config.enum.EGpuUploadMethod.AUTO": - "Auto", - "lod.config.enum.EGpuUploadMethod.BUFFER_STORAGE": - "Buffer storage", - "lod.config.enum.EGpuUploadMethod.SUB_DATA": - "Sub data", - "lod.config.enum.EGpuUploadMethod.BUFFER_MAPPING": - "Buffer mapping", - "lod.config.enum.EGpuUploadMethod.DATA": - "Data", - - "lod.config.enum.EBufferRebuildTimes.CONSTANT": - "Constant", - "lod.config.enum.EBufferRebuildTimes.FREQUENT": - "Frequent", - "lod.config.enum.EBufferRebuildTimes.NORMAL": - "Normal", - "lod.config.enum.EBufferRebuildTimes.RARE": - "Rare" -} diff --git a/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java b/core/src/test/java/testItems/overrideInjection/interfaces/IOverrideTest.java index 5a469a9b0..ff0d377be 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.interfaces.override.IDhApiOverrideable; +import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable; /** * Dummy override test interface for dependency unit tests. diff --git a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java index 1a1dc137b..7da74f522 100644 --- a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java +++ b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java @@ -1,6 +1,6 @@ package testItems.overrideInjection.objects; -import com.seibel.lod.coreapi.util.StringUtil; +import com.seibel.distanthorizons.coreapi.util.StringUtil; /** * assembly classes are used to reference the package they are in. diff --git a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java index 6cd830856..f13a969e4 100644 --- a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java +++ b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java @@ -1,6 +1,6 @@ package testItems.overrideInjection.objects; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; import testItems.overrideInjection.interfaces.IOverrideTest; /** diff --git a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java index 5e9b8a591..d4ee85bdb 100644 --- a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java +++ b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java @@ -1,6 +1,6 @@ package testItems.overrideInjection.objects; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; import testItems.overrideInjection.interfaces.IOverrideTest; /** diff --git a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java index 87802a599..d12d31b56 100644 --- a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java +++ b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java @@ -1,6 +1,6 @@ package testItems.singletonInjection.interfaces; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * Dummy test interface for dependency unit tests. diff --git a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java index f47898a69..f7da32a76 100644 --- a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java +++ b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java @@ -1,6 +1,6 @@ package testItems.singletonInjection.interfaces; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; /** * Dummy test interface for dependency unit tests. diff --git a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java index 7448c0199..3bfe23a63 100644 --- a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java +++ b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java @@ -1,6 +1,6 @@ package testItems.singletonInjection.objects; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import testItems.singletonInjection.interfaces.ISingletonTestOne; import testItems.singletonInjection.interfaces.ISingletonTestTwo; diff --git a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java index d079c021f..d79653bb1 100644 --- a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java +++ b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java @@ -1,7 +1,7 @@ package testItems.singletonInjection.objects; -import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import testItems.singletonInjection.interfaces.ISingletonTestOne; import testItems.singletonInjection.interfaces.ISingletonTestTwo; diff --git a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java index fcea7b58e..9215bdd0f 100644 --- a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java +++ b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java @@ -1,7 +1,7 @@ package testItems.singletonInjection.objects; -import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; import testItems.singletonInjection.interfaces.ISingletonTestOne; import testItems.singletonInjection.interfaces.ISingletonTestTwo; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java index 613f926f9..a4a38c278 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.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; /** * Stub implementation of a Level wrapper for basic unit testing. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java index 63546d2cc..bd022a605 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java @@ -1,10 +1,10 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.core.util.LodUtil; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java index 9833bd440..3c1978e91 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java @@ -1,6 +1,6 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.coreapi.util.StringUtil; +import com.seibel.distanthorizons.coreapi.util.StringUtil; /** * assembly classes are used to reference the package they are in. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java index 8a06f1560..eb8daf897 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java @@ -1,7 +1,7 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; /** * Dummy test implementation object for world generator injection unit tests. * diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java index 041843b8a..4f62ff860 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java @@ -1,7 +1,7 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java index 16ccc79bb..45af0d7cc 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java @@ -1,7 +1,7 @@ package testItems.worldGeneratorInjection.objects; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenThreadMode; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/tests/DependencyInjectorTest.java b/core/src/test/java/tests/DependencyInjectorTest.java index 57ae927e9..fb0ce196e 100644 --- a/core/src/test/java/tests/DependencyInjectorTest.java +++ b/core/src/test/java/tests/DependencyInjectorTest.java @@ -1,11 +1,11 @@ package tests; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector; -import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; -import com.seibel.lod.coreapi.DependencyInjection.WorldGeneratorInjector; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; +import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector; +import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.distanthorizons.coreapi.DependencyInjection.WorldGeneratorInjector; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/tests/DhSectionPosTest.java b/core/src/test/java/tests/DhSectionPosTest.java index f4e27ab49..97c9149ac 100644 --- a/core/src/test/java/tests/DhSectionPosTest.java +++ b/core/src/test/java/tests/DhSectionPosTest.java @@ -19,8 +19,8 @@ package tests; -import com.seibel.lod.core.pos.DhLodPos; -import com.seibel.lod.core.pos.DhSectionPos; +import com.seibel.distanthorizons.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.pos.DhSectionPos; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/tests/QuadTreeTest.java b/core/src/test/java/tests/QuadTreeTest.java index f81d62453..80bbebc0e 100644 --- a/core/src/test/java/tests/QuadTreeTest.java +++ b/core/src/test/java/tests/QuadTreeTest.java @@ -19,14 +19,14 @@ package tests; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos2D; -import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.coreapi.util.BitShiftUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.coreapi.util.MathUtil; -import com.seibel.lod.core.util.objects.quadTree.QuadNode; -import com.seibel.lod.core.util.objects.quadTree.QuadTree; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos2D; +import com.seibel.distanthorizons.core.pos.DhSectionPos; +import com.seibel.distanthorizons.coreapi.util.BitShiftUtil; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.coreapi.util.MathUtil; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; +import com.seibel.distanthorizons.core.util.objects.quadTree.QuadTree; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configurator; diff --git a/core/src/test/java/tests/RaycastingTest.java b/core/src/test/java/tests/RaycastingTest.java index 4a9e19098..fd50bf7dc 100644 --- a/core/src/test/java/tests/RaycastingTest.java +++ b/core/src/test/java/tests/RaycastingTest.java @@ -19,7 +19,7 @@ package tests; -import com.seibel.lod.core.util.RayCastUtil; +import com.seibel.distanthorizons.core.util.RayCastUtil; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/tests/SquareIntersectTest.java b/core/src/test/java/tests/SquareIntersectTest.java index 240802a64..a3965111f 100644 --- a/core/src/test/java/tests/SquareIntersectTest.java +++ b/core/src/test/java/tests/SquareIntersectTest.java @@ -19,8 +19,8 @@ package tests; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhLodPos; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhLodPos; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configurator;