update to 1.3.2

myunco · Dec 27, 2022 · b0b50a2 · b0b50a2
1 parent 1eafabb
commit b0b50a2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 405 deletions.
diff --git a/src/ml/mcos/servermonitor/config/Config.java b/src/ml/mcos/servermonitor/config/Config.java
@@ -2,19 +2,16 @@
 
 import ml.mcos.servermonitor.ServerMonitor;
 import ml.mcos.servermonitor.util.Util;
-import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.List;
 
@@ -90,7 +87,7 @@ public static void setValue(String path, Object value) {
     public static YamlConfiguration loadConfiguration(File file) {
         YamlConfiguration config = new YamlConfiguration();
         try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8));
             StringBuilder builder = new StringBuilder();
             String line;
             try {
@@ -101,18 +98,14 @@ public static YamlConfiguration loadConfiguration(File file) {
                 reader.close();
             }
             config.loadFromString(builder.toString());
-        } catch (FileNotFoundException e) {
-            Util.sendException("FileNotFoundException: " + file.getName(), e.getMessage());
-        } catch (IOException e) {
-            Util.sendException("IOException: " + file.getName(), e.getMessage());
-        } catch (InvalidConfigurationException e) {
-            Util.sendException("InvalidConfigurationException: " + file.getName(), e.getMessage());
+        } catch (Exception e) {
+            Util.sendException(e.getClass().getName() + ": " + file.getName(), e.getMessage());
         }
         return config;
     }
 
     public static void saveConfiguration(YamlConfiguration config, File file) {
-        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
+        try (Writer writer = new OutputStreamWriter(Files.newOutputStream(file.toPath()), StandardCharsets.UTF_8)) {
             writer.write(config.saveToString());
         } catch (IOException e) {
             Util.sendException(Language.messageExceptionSave.replace("{file}", "config.yml"), e.getMessage());

diff --git a/src/ml/mcos/servermonitor/config/Language.java b/src/ml/mcos/servermonitor/config/Language.java
@@ -5,10 +5,10 @@
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 public class Language {
     private static final ServerMonitor plugin = ServerMonitor.getPlugin();
@@ -116,7 +116,7 @@ private static void saveDefaultLanguage(File lang, String langPath) {
                 InputStream in = plugin.getResource("languages/zh_cn.yml");
                 if (in != null) {
                     try {
-                        OutputStream out = new FileOutputStream(lang);
+                        OutputStream out = Files.newOutputStream(lang.toPath());
                         byte[] buf = new byte[1024];
                         int len;
                         while ((len = in.read(buf)) != -1) {