From e9c97221eccbe2d5fb97ca280197dc2289b3568b Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Sat, 13 Jul 2024 21:04:41 +0200 Subject: [PATCH] Remove obsolete special handling in settings save --- .../viafabricplus/save/impl/SettingsSave.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java b/src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java index a3a87f64..a21a1e55 100644 --- a/src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java +++ b/src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java @@ -25,7 +25,6 @@ import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; import de.florianmichael.viafabricplus.save.AbstractSave; import de.florianmichael.viafabricplus.settings.SettingsManager; import de.florianmichael.viafabricplus.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.settings.base.ButtonSetting; import de.florianmichael.viafabricplus.settings.base.SettingGroup; import de.florianmichael.viafabricplus.settings.impl.GeneralSettings; import de.florianmichael.viafabricplus.util.ChatUtil; @@ -58,12 +57,13 @@ public class SettingsSave extends AbstractSave { @Override public void read(JsonObject object) { for (SettingGroup group : settingsManager.getGroups()) { - final JsonObject groupObject = object.getAsJsonObject(AbstractSetting.mapTranslationKey(ChatUtil.uncoverTranslationKey(group.getName()))); + final String translationKey = ChatUtil.uncoverTranslationKey(group.getName()); + + final JsonObject groupObject = object.getAsJsonObject(AbstractSetting.mapTranslationKey(translationKey)); for (AbstractSetting setting : group.getSettings()) { - if (!groupObject.has(setting.getTranslationKey()) && !(setting instanceof ButtonSetting)) { - continue; + if (groupObject.has(setting.getTranslationKey())) { + setting.read(groupObject); } - setting.read(groupObject); } }