From 1de329ed9b0d4db7843b9a2a16ab3ffae5c3fb8a Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 17 Jun 2023 21:53:22 -0500 Subject: [PATCH] Fix some config setup not running if the UI isn't opened --- .../distanthorizons/common/LodCommonMain.java | 6 ++++-- .../common/wrappers/gui/GetConfigScreen.java | 14 -------------- coreSubProjects | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java b/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java index 909fcd7ba..c4097ef7c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java @@ -48,7 +48,9 @@ public class LodCommonMain { // } } - public static void initConfig() { + public static void initConfig() + { ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class,1); - } + Config.completeDelayedSetup(); + } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java index b8b69b680..3894aa9f9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java @@ -28,8 +28,6 @@ public class GetConfigScreen // This shouldn't be here, but I need a way to test it after Minecraft inits its assets //System.out.println(ConfigBase.INSTANCE.generateLang(false, true)); - runGuiOnlyConfigSetup(); - return switch (useScreen) { case Classic -> ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client"); @@ -39,16 +37,4 @@ public class GetConfigScreen default -> null; }; } - - /** - * Updates any config values that are UI only - * and adds any listeners that depend on multiple config values. - */ - private static void runGuiOnlyConfigSetup() - { - ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues(); - RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues(); - QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues(); - } - } \ No newline at end of file diff --git a/coreSubProjects b/coreSubProjects index ac73b52b2..773cd3aae 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit ac73b52b233626cb44b76244c2c06e8b70a135d5 +Subproject commit 773cd3aaefaa3dadda41da56d72d0c67fac5226d