diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java index d1a03fe39..4457d3105 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java @@ -185,7 +185,7 @@ public abstract class AbstractModInitializer private void initConfig() { - ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, 2); + ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, ModInfo.CONFIG_FILE_VERSION); Config.completeDelayedSetup(); } @@ -341,7 +341,7 @@ public abstract class AbstractModInitializer */ private static void logModIncompatibilityWarnings() { - boolean showChatWarnings = Config.Client.Advanced.Logging.showModCompatibilityWarningsOnStartup.get(); + boolean showChatWarnings = Config.Common.Logging.Warning.showModCompatibilityWarningsOnStartup.get(); IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class); String startingString = "Partially Incompatible Distant Horizons mod detected: "; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java index 0d625e341..959e05588 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java @@ -15,7 +15,6 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import org.apache.logging.log4j.LogManager; -import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.util.Objects; @@ -23,7 +22,7 @@ import java.util.Objects; public abstract class AbstractPluginPacketSender implements IPluginPacketSender { private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(), - () -> Config.Client.Advanced.Logging.logNetworkEvent.get()); + () -> Config.Common.Logging.logNetworkEvent.get()); #if MC_VER >= MC_1_21_1 public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index 1711abaec..e2ea43d98 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -235,7 +235,7 @@ public class BlockStateWrapper implements IBlockStateWrapper HashSet baseIgnoredBlock = new HashSet<>(); baseIgnoredBlock.add(AIR_STRING); - rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.LodBuilding.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper); + rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper); return rendererIgnoredBlocks; } /** @@ -252,7 +252,7 @@ public class BlockStateWrapper implements IBlockStateWrapper HashSet baseIgnoredBlock = new HashSet<>(); baseIgnoredBlock.add(AIR_STRING); - rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.LodBuilding.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper); + rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper); return rendererIgnoredCaveBlocks; } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index ae0ac876a..556ea3de3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -16,7 +16,6 @@ import java.util.regex.Pattern; // Logger (for debug stuff) import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui; -import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.ConfigBase; import com.seibel.distanthorizons.core.config.types.*; @@ -387,9 +386,9 @@ public class ClassicConfigGUI this.list.addButton(null, null, null, name); return; } - if (ConfigLinkedEntry.class.isAssignableFrom(info.getClass())) + if (ConfigUiLinkedEntry.class.isAssignableFrom(info.getClass())) { - this.addMenuItem(((ConfigLinkedEntry) info).get()); + this.addMenuItem(((ConfigUiLinkedEntry) info).get()); return; } @@ -438,8 +437,8 @@ public class ClassicConfigGUI } // A quick fix for tooltips on linked entries - AbstractConfigType newInfo = ConfigLinkedEntry.class.isAssignableFrom(info.getClass()) ? - ((ConfigLinkedEntry) info).get() : + AbstractConfigType newInfo = ConfigUiLinkedEntry.class.isAssignableFrom(info.getClass()) ? + ((ConfigUiLinkedEntry) info).get() : info; Component name = Translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.getName()); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index d68f2b58b..d66d891f1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -111,7 +111,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra @Override public float getShade(EDhDirection lodDirection) { - EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get(); + EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.Quality.lodShading.get(); switch (lodShading) { default: diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 9bbdbb5eb..30d62dd77 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -25,7 +25,6 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGenerat import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.*; -import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer; import com.seibel.distanthorizons.core.generation.DhLightingEngine; import com.seibel.distanthorizons.core.level.IDhServerLevel; import com.seibel.distanthorizons.core.config.Config; @@ -102,13 +101,13 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv { public static final ConfigBasedSpamLogger PREF_LOGGER = new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"), - () -> Config.Client.Advanced.Logging.logWorldGenPerformance.get(), 1); + () -> Config.Common.Logging.logWorldGenPerformance.get(), 1); public static final ConfigBasedLogger EVENT_LOGGER = new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"), - () -> Config.Client.Advanced.Logging.logWorldGenEvent.get()); + () -> Config.Common.Logging.logWorldGenEvent.get()); public static final ConfigBasedLogger LOAD_LOGGER = new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"), - () -> Config.Client.Advanced.Logging.logWorldGenLoadEvent.get()); + () -> Config.Common.Logging.logWorldGenLoadEvent.get()); public static class PerfCalculator { @@ -349,10 +348,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv iter.remove(); } - else if (event.hasTimeout(Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(), TimeUnit.SECONDS)) + else if (event.hasTimeout(Config.Common.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(), TimeUnit.SECONDS)) { EVENT_LOGGER.warn( - "Batching World Generator: [" + event + "] timed out and terminated after ["+Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get()+"] seconds. " + + "Batching World Generator: [" + event + "] timed out and terminated after ["+Config.Common.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get()+"] seconds. " + "\nYour computer might be overloaded or your world gen mods might be causing world gen to take longer than expected. " + "\nEither increase DH's world gen timeout or reduce your computer's CPU load."); EVENT_LOGGER.debug("Dump PrefEvent: " + event.timer); @@ -374,7 +373,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv { EVENT_LOGGER.error("Too many exceptions in Batching World Generator! Disabling the generator."); this.unknownExceptionCount = 0; - Config.Client.Advanced.WorldGenerator.enableDistantGeneration.set(false); + Config.Common.WorldGenerator.enableDistantGeneration.set(false); } } @@ -587,7 +586,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv CompoundTag chunkData = this.getChunkNbtData(chunkPos); newChunk = this.loadOrMakeChunk(chunkPos, chunkData); - if (Config.Client.Advanced.LodBuilding.pullLightingForPregeneratedChunks.get()) + if (Config.Common.LodBuilding.pullLightingForPregeneratedChunks.get()) { // attempt to get chunk lighting ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData); @@ -628,7 +627,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv #else // timeout should prevent locking up the thread if the ioWorker dies or has issues - int maxGetTimeInSec = Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(); + int maxGetTimeInSec = Config.Common.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(); CompletableFuture> future = ioWorker.loadAsync(chunkPos); try { diff --git a/coreSubProjects b/coreSubProjects index 633ee7f0f..bd6e6b47b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 633ee7f0f9c6b607c750ea10638f6a2beb11d0cd +Subproject commit bd6e6b47bbe76931602755971f9ddc9b0393972b diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index 95597dabd..1e76226cc 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -142,7 +142,7 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti { SingletonInjector.INSTANCE.runDelayedSetup(); - if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib")) + if (!Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib")) { ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog } diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java index 3f24f1865..fbf6f82e4 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java @@ -69,7 +69,7 @@ public class MixinFogRenderer boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS); if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial() - && Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get()) + && !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get()) { #if MC_VER < MC_1_17_1 RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE); diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java index 55f0368c4..e17caa32f 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java @@ -91,7 +91,7 @@ public class MixinOptionsScreen extends Screen @Inject(at = @At("RETURN"), method = "init") private void lodconfig$init(CallbackInfo ci) { - if (Config.Client.optionsButton.get()) + if (Config.Client.showDhOptionsButtonInMinecraftUi.get()) { #if MC_VER < MC_1_17_1 this.addButton(this.getOptionsButton()); diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java index 597d5a609..e190eb9ad 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java @@ -19,7 +19,7 @@ public class MixinTextureUtil at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V", #if MC_VER == MC_1_16_5 remap = true #else remap = false #endif)) private static void setLodBias(int target, int pname, float param) { - float biasValue = Config.Client.Advanced.Graphics.AdvancedGraphics.lodBias.get().floatValue(); + float biasValue = Config.Client.Advanced.Graphics.Quality.lodBias.get().floatValue(); if (biasValue != 0) { // The target is GL11.GL_TEXTURE_2D diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java index 1134dab26..5e629b5d8 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java @@ -33,11 +33,4 @@ public class OptifineAccessor extends AbstractOptifineAccessor return "Optifine-Fabric-1.18.X"; } - @Override - public HashSet getNormalRenderedChunks() - { - // TODO: Impl proper methods here - return null; - } - } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java index 0468a72da..a8e956e6d 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java @@ -69,7 +69,7 @@ public class MixinFogRenderer boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS); if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial() - && Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get()) + && !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get()) { #if MC_VER < MC_1_17_1 RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java index 488984f06..955eedbb6 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java @@ -91,7 +91,7 @@ public class MixinOptionsScreen extends Screen @Inject(at = @At("RETURN"), method = "init") private void lodconfig$init(CallbackInfo ci) { - if (Config.Client.optionsButton.get()) + if (Config.Client.showDhOptionsButtonInMinecraftUi.get()) { #if MC_VER < MC_1_17_1 this.addButton(this.getOptionsButton()); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java index 57b40bc72..fb933a3bb 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java @@ -19,7 +19,7 @@ public class MixinTextureUtil at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V"), remap = false) private static void setLodBias(int target, int pname, float param) { - float biasValue = Config.Client.Advanced.Graphics.AdvancedGraphics.lodBias.get().floatValue(); + float biasValue = Config.Client.Advanced.Graphics.Quality.lodBias.get().floatValue(); if (biasValue != 0) { // The target is GL11.GL_TEXTURE_2D diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/OptifineAccessor.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/OptifineAccessor.java index ceb05847c..d0f1579d4 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/OptifineAccessor.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/OptifineAccessor.java @@ -33,11 +33,4 @@ public class OptifineAccessor extends AbstractOptifineAccessor return "Optifine-Forge-1.18.X"; } - @Override - public HashSet getNormalRenderedChunks() - { - // TODO: Impl proper methods here - return null; - } - }