From f8dabec8638fe7b9f9ec3b941f753a9b2aca3be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A4seToatz?= <airfryerkipcorn@gmail.com>
Date: Mon, 15 Jul 2024 23:05:31 +0200
Subject: [PATCH] better config handling

---
 gradle.properties                                        | 2 +-
 .../java/com/kasetoatz/tridenthacks/TridentHacks.java    | 2 +-
 .../java/com/kasetoatz/tridenthacks/config/Config.java   | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3bddc66..0fb2e3a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.16.0
 
 # Mod Properties
-	mod_version = 1.2
+	mod_version = 1.2.1
 	maven_group = com.kasetoatz
 	archives_base_name = TridentHacks
 
diff --git a/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java b/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java
index fda1e07..3ea3e0d 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java
@@ -25,8 +25,8 @@ public class TridentHacks implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        client = MinecraftClient.getInstance();
         Config.load();
+        client = MinecraftClient.getInstance();
         keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("Toggle Riptide", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_ALT, "RiptideHacks"));
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             while (keyBinding.wasPressed()) {
diff --git a/src/main/java/com/kasetoatz/tridenthacks/config/Config.java b/src/main/java/com/kasetoatz/tridenthacks/config/Config.java
index 0ee0c31..d0496e8 100644
--- a/src/main/java/com/kasetoatz/tridenthacks/config/Config.java
+++ b/src/main/java/com/kasetoatz/tridenthacks/config/Config.java
@@ -4,6 +4,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.Gson;
 import com.kasetoatz.tridenthacks.TridentHacks;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.crash.CrashReport;
 
@@ -19,8 +20,10 @@ public class Config {
     public static String riptideOnMessage = "Riptide §aON";
     public static String riptideOffMessage = "Riptide §cOFF";
 
+    private static final File file = new File(MinecraftClient.getInstance().runDirectory, "config/tridenthacks.json");
+    private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
     public static void load() {
-        File file = new File(TridentHacks.client.runDirectory, "config/tridenthacks.json");
         if (!file.exists())
         {
             save();
@@ -28,7 +31,6 @@ public class Config {
         }
         try (FileReader reader = new FileReader(file))
         {
-            Gson gson = new GsonBuilder().setPrettyPrinting().create();
             JsonObject json = gson.fromJson(reader, JsonObject.class);
             if (json.has("toggleRiptide"))
             {
@@ -50,6 +52,7 @@ public class Config {
             {
                 riptideOffMessage = json.get("riptideOffMessage").getAsString();
             }
+            save();
         }
         catch (IOException exc)
         {
@@ -67,7 +70,7 @@ public class Config {
         json.addProperty("riptideOffMessage", riptideOffMessage);
         try (FileWriter writer = new FileWriter(new File(TridentHacks.client.runDirectory, "config/tridenthacks.json")))
         {
-            new GsonBuilder().setPrettyPrinting().create().toJson(json, writer);
+            gson.toJson(json, writer);
         }
         catch (IOException exc)
         {