From 811a56f3fa8d490d8b274ceed65d56e083331c02 Mon Sep 17 00:00:00 2001 From: noil Date: Wed, 17 May 2023 02:05:59 -0400 Subject: [PATCH] LoadCommand remove unloading test for reload later --- .../seppuku/impl/command/LoadCommand.java | 13 ++++++------- .../seppuku/impl/management/ConfigManager.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/LoadCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/LoadCommand.java index 081d52e..12d65a5 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/LoadCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/LoadCommand.java @@ -64,7 +64,6 @@ public final class LoadCommand extends Command { } if (entry.getKey().equalsIgnoreCase("Search")) { this.loadConfigForClass(SearchConfig.class, entry.getValue().getAsJsonObject()); - } Seppuku.INSTANCE.getModuleManager().getModuleList().forEach(module -> { if (entry.getKey().equalsIgnoreCase("Module" + module.getDisplayName())) { @@ -78,8 +77,8 @@ public final class LoadCommand extends Command { }); }); - Seppuku.INSTANCE.unloadSimple(); - Seppuku.INSTANCE.init(); +// Seppuku.INSTANCE.getConfigManager().saveAll(); +// Seppuku.INSTANCE.reload(); Seppuku.INSTANCE.logChat("\247c" + "Loaded config from server"); } @@ -94,8 +93,8 @@ public final class LoadCommand extends Command { private void loadModuleConfigForClass(Class configClass, JsonObject jsonObject, String displayName) { Seppuku.INSTANCE.getConfigManager().getConfigurableList().stream().filter(configurable -> configurable.getClass().equals(ModuleConfig.class)).forEach(configurable -> { final ModuleConfig moduleConfig = (ModuleConfig) configurable; - if (moduleConfig.getModule().getDisplayName().equals(displayName)) { - configurable.onLoad(jsonObject); + if (moduleConfig.getModule().getDisplayName().equalsIgnoreCase(displayName)) { + moduleConfig.onLoad(jsonObject); } }); } @@ -103,8 +102,8 @@ public final class LoadCommand extends Command { private void loadHudConfigForClass(Class configClass, JsonObject jsonObject, String name) { Seppuku.INSTANCE.getConfigManager().getConfigurableList().stream().filter(configurable -> configurable.getClass().equals(HudConfig.class)).forEach(configurable -> { final HudConfig hudConfig = (HudConfig) configurable; - if (hudConfig.getHudComponent().getName().equals(name)) { - configurable.onLoad(jsonObject); + if (hudConfig.getHudComponent().getName().equalsIgnoreCase(name)) { + hudConfig.onLoad(jsonObject); } }); } diff --git a/src/main/java/me/rigamortis/seppuku/impl/management/ConfigManager.java b/src/main/java/me/rigamortis/seppuku/impl/management/ConfigManager.java index 5d909b2..19c4390 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/management/ConfigManager.java +++ b/src/main/java/me/rigamortis/seppuku/impl/management/ConfigManager.java @@ -86,7 +86,7 @@ public final class ConfigManager { this.configurableList.add(new ModuleConfig(this.moduleConfigDir, module)); }); - Seppuku.INSTANCE.getHudManager().getComponentList().stream().forEach(hudComponent -> { + Seppuku.INSTANCE.getHudManager().getComponentList().forEach(hudComponent -> { this.configurableList.add(new HudConfig(this.hudComponentConfigDir, hudComponent)); });