diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index 719ebd25c..386d4ec0c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -104,7 +104,7 @@ public class Config public static ConfigUiLinkedEntry quickEnableWorldGenerator = new ConfigUiLinkedEntry(Common.WorldGenerator.enableDistantGeneration); public static ConfigEntry quickShowWorldGenProgress = new ConfigEntry.Builder() - .set(true) + .set(false) // TODO should be set by the underlying world gen progress button, not a static default .setAppearance(EConfigEntryAppearance.ONLY_IN_GUI) .build(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/QuickShowWorldGenProgressConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/QuickShowWorldGenProgressConfigEventHandler.java index e0891d776..9d80e9c1b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/QuickShowWorldGenProgressConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/QuickShowWorldGenProgressConfigEventHandler.java @@ -39,14 +39,17 @@ public class QuickShowWorldGenProgressConfigEventHandler this.quickChangeListener = new ConfigChangeListener<>(Config.Client.quickShowWorldGenProgress, (val) -> { - Config.Common.WorldGenerator.showGenerationProgress.set(Config.Client.quickShowWorldGenProgress.get() - ? Config.Common.WorldGenerator.showGenerationProgress.getDefaultValue() + boolean quickShowProgress = Config.Client.quickShowWorldGenProgress.get(); + Config.Common.WorldGenerator.showGenerationProgress.set( + quickShowProgress + ? EDhApiDistantGeneratorProgressDisplayLocation.OVERLAY : EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); }); this.fullChangeListener = new ConfigChangeListener<>(Config.Common.WorldGenerator.showGenerationProgress, (val) -> { - Config.Client.quickShowWorldGenProgress.set(Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); + boolean showProgress = Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED; + Config.Client.quickShowWorldGenProgress.setWithoutFiringEvents(showProgress); }); }