From 6534eb32c587ab1ab8fbc11d8ad09ac26704b720 Mon Sep 17 00:00:00 2001
From: noil <robloxguy@protonmail.com>
Date: Wed, 17 May 2023 01:43:05 -0400
Subject: [PATCH] Final fixes to Load/Save/Export commands

---
 .../rigamortis/seppuku/api/config/Configurable.java  |  4 ++--
 .../seppuku/impl/command/ExportCommand.java          | 12 ++++++------
 .../rigamortis/seppuku/impl/command/LoadCommand.java |  3 +++
 .../rigamortis/seppuku/impl/command/SaveCommand.java |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/me/rigamortis/seppuku/api/config/Configurable.java b/src/main/java/me/rigamortis/seppuku/api/config/Configurable.java
index b78e13c..67701da 100644
--- a/src/main/java/me/rigamortis/seppuku/api/config/Configurable.java
+++ b/src/main/java/me/rigamortis/seppuku/api/config/Configurable.java
@@ -37,11 +37,11 @@ public abstract class Configurable {
 
     }
 
-    protected void saveJsonObjectToFile(JsonObject object) {
+    public void saveJsonObjectToFile(JsonObject object) {
         FileUtil.saveJsonFile(FileUtil.recreateFile(this.getFile()), object);
     }
 
-    protected JsonObject convertJsonObjectFromFile() {
+    public JsonObject convertJsonObjectFromFile() {
         if (!this.getFile().exists())
             return new JsonObject();
 
diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/ExportCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/ExportCommand.java
index c7681c7..8d92713 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/command/ExportCommand.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/command/ExportCommand.java
@@ -16,7 +16,7 @@ import java.io.File;
  */
 public final class ExportCommand extends Command {
     public ExportCommand() {
-        super("Export", new String[]{"Exprt"}, "Export all Module & HUD configs into a single json for upload on Seppuku's website.", "Export <config_name>");
+        super("Export", new String[]{"Exprt"}, "Export all Module & HUD configs into a single json for upload on Seppuku's website", "Export <config_name>");
     }
 
     @Override
@@ -33,25 +33,25 @@ public final class ExportCommand extends Command {
         JsonObject endJson = new JsonObject();
         for (Configurable cfg : Seppuku.INSTANCE.getConfigManager().getConfigurableList()) {
             if (cfg.getClass().equals(ClientConfig.class)) {
-                final JsonObject clientJson = cfg.getJsonObject();
+                final JsonObject clientJson = cfg.convertJsonObjectFromFile();
                 endJson.add("Client", clientJson);
             }
             if (cfg.getClass().equals(XrayConfig.class)) {
-                final JsonObject xrayJson = cfg.getJsonObject();
+                final JsonObject xrayJson = cfg.convertJsonObjectFromFile();
                 endJson.add("Xray", xrayJson);
             }
             if (cfg.getClass().equals(SearchConfig.class)) {
-                final JsonObject searchJson = cfg.getJsonObject();
+                final JsonObject searchJson = cfg.convertJsonObjectFromFile();
                 endJson.add("Search", searchJson);
             }
             if (cfg.getClass().equals(ModuleConfig.class)) {
-                final JsonObject moduleJson = cfg.getJsonObject();
+                final JsonObject moduleJson = cfg.convertJsonObjectFromFile();
                 final ModuleConfig moduleConfig = (ModuleConfig) cfg;
                 final Module module = moduleConfig.getModule();
                 endJson.add("Module" + module.getDisplayName(), moduleJson);
             }
             if (cfg.getClass().equals(HudConfig.class)) {
-                final JsonObject hudJson = cfg.getJsonObject();
+                final JsonObject hudJson = cfg.convertJsonObjectFromFile();
                 final HudConfig hudConfig = (HudConfig) cfg;
                 final HudComponent hudComponent = hudConfig.getHudComponent();
                 endJson.add("HudComponent" + hudComponent.getName(), hudJson);
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 b52f80c..0fd7720 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/command/LoadCommand.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/command/LoadCommand.java
@@ -78,6 +78,9 @@ public final class LoadCommand extends Command {
                 });
             });
 
+            Seppuku.INSTANCE.unloadSimple();
+            Seppuku.INSTANCE.init();
+
             Seppuku.INSTANCE.logChat("\247c" + "Loaded config from server.");
         }
     }
diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/SaveCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/SaveCommand.java
index 2fb0809..ba697ac 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/command/SaveCommand.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/command/SaveCommand.java
@@ -9,7 +9,7 @@ import me.rigamortis.seppuku.api.command.Command;
 public final class SaveCommand extends Command {
 
     public SaveCommand() {
-        super("Save", new String[]{"SaveAll"}, "Saves all client settings to disk.", "Save");
+        super("Save", new String[]{"SaveAll"}, "Saves all client settings to disk", "Save");
     }
 
     @Override
@@ -20,7 +20,7 @@ public final class SaveCommand extends Command {
         }
 
         Seppuku.INSTANCE.getConfigManager().saveAll();
-        Seppuku.INSTANCE.logChat("Saved current config.");
+        Seppuku.INSTANCE.logChat("Saved current config");
     }
 }