From 60689840bd705b5b26897095b70c18745b396906 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Tue, 5 Dec 2023 21:38:54 -0600 Subject: [PATCH] more reorg --- .../quiltmc/enigma/gui/config/Decompiler.java | 4 --- .../enigma/gui/config/DecompilerConfig.java | 26 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Decompiler.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Decompiler.java index 690b93648..e66af2967 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Decompiler.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Decompiler.java @@ -27,8 +27,4 @@ public enum Decompiler { this.service = service; this.settingsDialog = settingsDialog; } - - static { - DecompilerConfig.bootstrap(); - } } diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/DecompilerConfig.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/DecompilerConfig.java index 948d2e8ec..0736ac716 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/DecompilerConfig.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/DecompilerConfig.java @@ -9,29 +9,29 @@ public class DecompilerConfig extends ReflectiveConfig { public DecompilerConfig() { - VineflowerPreferences.OPTIONS.putAll(this.stringValues.value()); - VineflowerPreferences.OPTIONS.putAll(this.intValues.value()); - VineflowerPreferences.OPTIONS.putAll(this.booleanValues.value()); + VineflowerPreferences.OPTIONS.putAll(this.vineflowerSection.stringValues.value()); + VineflowerPreferences.OPTIONS.putAll(this.vineflowerSection.intValues.value()); + VineflowerPreferences.OPTIONS.putAll(this.vineflowerSection.booleanValues.value()); } public final TrackedValue decompiler = this.value(Decompiler.VINEFLOWER); - public final TrackedValue> stringValues = this.map("").build(); - public final TrackedValue> intValues = this.map(0).build(); - public final TrackedValue> booleanValues = this.map(true).build(); + public final VineflowerSection vineflowerSection = new VineflowerSection(); + + public static final class VineflowerSection extends Section { + public final TrackedValue> stringValues = this.map("").build(); + public final TrackedValue> intValues = this.map(0).build(); + public final TrackedValue> booleanValues = this.map(true).build(); + } public static void updateVineflowerValues(Map options) { for (Map.Entry entry : options.entrySet()) { if (entry.getValue() instanceof String s) { - Config.decompiler().stringValues.value().put(entry.getKey(), s); + Config.decompiler().vineflowerSection.stringValues.value().put(entry.getKey(), s); } else if (entry.getValue() instanceof Integer i) { - Config.decompiler().intValues.value().put(entry.getKey(), i); + Config.decompiler().vineflowerSection.intValues.value().put(entry.getKey(), i); } else if (entry.getValue() instanceof Boolean b) { - Config.decompiler().booleanValues.value().put(entry.getKey(), b); + Config.decompiler().vineflowerSection.booleanValues.value().put(entry.getKey(), b); } } } - - public static void bootstrap() { - // Just run the static initialization - } }