fix some error

xinyihl · Jun 18, 2024 · 5a10100 · 5a10100
1 parent aefe43b
commit 5a10100
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/mnm/mods/tabbychat/settings/ServerSettings.java b/src/main/java/mnm/mods/tabbychat/settings/ServerSettings.java
@@ -30,7 +30,6 @@ public class ServerSettings extends SettingsFile {
     public ServerSettings(SocketAddress url) {
         super(Reference.MOD_ID + "/" + getIPForFileName(url), "server");
         this.ip = url;
-        if (!generalFile.exists() || !filtersFile.exists() || !channelsFile.exists()) saveConfig();
     }
 
     private static String getIPForFileName(SocketAddress addr) {
@@ -46,6 +45,7 @@ private static String getIPForFileName(SocketAddress addr) {
 
     @Override
     public void loadConfig() {
+        if (!generalFile.exists() && !filtersFile.exists() && !channelsFile.exists()) saveConfig();
         general = loadFromJson(generalFile, (new TypeToken<GeneralServerSettings>(){}.getType()));
         filters = loadFromJson(filtersFile, (new TypeToken<ValueList<UserFilter>>(){}.getType()));
         channels = loadFromJson(channelsFile, (new TypeToken<ValueMap<ChatChannel>>(){}.getType()));
@@ -54,8 +54,8 @@ public void loadConfig() {
     @Override
     public void saveConfig() {
         saveToJson(generalFile, general);
-        saveToJson(filtersFile, general);
-        saveToJson(channelsFile, general);
+        saveToJson(filtersFile, filters);
+        saveToJson(channelsFile, channels);
     }
 
     public SocketAddress getIP() {

diff --git a/src/main/java/mnm/mods/tabbychat/settings/TabbySettings.java b/src/main/java/mnm/mods/tabbychat/settings/TabbySettings.java
@@ -15,11 +15,11 @@ public class TabbySettings extends SettingsFile {
 
     public TabbySettings() {
         super(Reference.MOD_ID, "tabbychat");
-        if (!generalFile.exists() || !advancedFile.exists()) saveConfig();
     }
 
     @Override
     public void loadConfig() {
+        if (!generalFile.exists() && !advancedFile.exists()) saveConfig();
         general = loadFromJson(generalFile, (new TypeToken<GeneralSettings>(){}.getType()));
         advanced = loadFromJson(advancedFile, (new TypeToken<AdvancedSettings>(){}.getType()));
     }

diff --git a/src/main/java/mnm/mods/util/config/SettingsFile.java b/src/main/java/mnm/mods/util/config/SettingsFile.java
@@ -3,10 +3,11 @@
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 import net.minecraft.client.Minecraft;
+import org.apache.commons.io.FileUtils;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
 
 /**
  * Used for creating settings and saving/loading them in the JSON format. Start
@@ -46,16 +47,16 @@ public File getFile() {
     public abstract void saveConfig();
 
     protected <T> void saveToJson(File file, T object) {
-        try (Writer writer = new OutputStreamWriter(java.nio.file.Files.newOutputStream(file.toPath()), StandardCharsets.UTF_8)) {
-            gson.toJson(object, writer);
+        try {
+            FileUtils.writeStringToFile(file, gson.toJson(object), "UTF-8");
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
     protected <T> T loadFromJson(File file, Type typeOfT) {
-        try (InputStreamReader reader = new InputStreamReader(java.nio.file.Files.newInputStream(file.toPath()), StandardCharsets.UTF_8)) {
-            return gson.fromJson(reader, typeOfT);
+        try {
+            return gson.fromJson(FileUtils.readFileToString(file, "UTF-8"), typeOfT);
         } catch (IOException e) {
             e.printStackTrace();
             return null;