fix: Correct generation of properties file in legacy version

blank038 · Oct 12, 2023 · 1c3c322 · 1c3c322
1 parent 6a8ee6f
commit 1c3c322
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/src/main/java/com/blank038/servermarket/ServerMarket.java b/src/main/java/com/blank038/servermarket/ServerMarket.java
@@ -68,11 +68,11 @@ public void loadConfig(boolean start) {
         this.getConsoleLogger().log(false, " ");
         this.saveDefaultConfig();
         this.reloadConfig();
+        // Initialize I18n
+        new I18n(this.getConfig().getString("language", "zh_CN"));
         // Run legacy converter
         LegacyBackup.check();
         if (this.isEnabled()) {
-            // Initialize I18n
-            new I18n(this.getConfig().getString("language", "zh_CN"));
             // Initialize IStorageHandler
             AbstractStorageHandler.check();
             storageHandler.reload();

diff --git a/src/main/java/com/blank038/servermarket/data/convert/LegacyBackup.java b/src/main/java/com/blank038/servermarket/data/convert/LegacyBackup.java
@@ -3,10 +3,11 @@
 import com.blank038.servermarket.ServerMarket;
 import com.blank038.servermarket.i18n.I18n;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.libs.org.apache.commons.io.FileUtils;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.logging.Level;
 
 /**
@@ -25,7 +26,8 @@ public static void check() {
                 // backups data
                 try {
                     String fileName = "ServerMarket-" + System.currentTimeMillis();
-                    FileUtils.copyDirectory(ServerMarket.getInstance().getDataFolder(), new File(backupFolder, fileName));
+                    Files.createDirectories(Paths.get("./backups", fileName));
+                    LegacyBackup.copyFile(ServerMarket.getInstance().getDataFolder(), new File(backupFolder, fileName));
                     ServerMarket.getInstance().saveResource("history.yml", "history.yml");
                     ServerMarket.getInstance().getConsoleLogger().log(false,
                             I18n.getProperties().getProperty("backup-completed").replace("%s", fileName));
@@ -36,4 +38,28 @@ public static void check() {
             }
         }
     }
+
+    private static boolean copyFile(File in, File out) throws IOException {
+        if (in.exists()) {
+            if (in.isDirectory()) {
+                out.mkdir();
+                for (File i : in.listFiles()) {
+                    LegacyBackup.copyFile(new File(in, i.getName()), new File(out, i.getName()));
+                }
+            } else if (in.isFile()) {
+                InputStreamReader isr = new InputStreamReader(Files.newInputStream(in.toPath()), StandardCharsets.UTF_8);
+                OutputStreamWriter osw = new OutputStreamWriter(Files.newOutputStream(out.toPath()),StandardCharsets.UTF_8);
+                char[] bytes = new char[1024];
+                int len;
+                while ((len = isr.read(bytes)) > 0) {
+                    osw.write(bytes, 0, len);
+                }
+                isr.close();
+                osw.flush();
+                osw.close();
+            }
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/com/blank038/servermarket/i18n/I18n.java b/src/main/java/com/blank038/servermarket/i18n/I18n.java
@@ -10,6 +10,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -67,8 +70,8 @@ public void init(String language) {
         this.header = "prefix";
         // initialize properties
         properties = new Properties();
-        try {
-            properties.load(ServerMarket.getInstance().getResource("properties/" + language + ".properties"));
+        try (InputStream resourceInputStream = ServerMarket.getInstance().getResource("properties/" + language + ".properties")) {
+            properties.load(new InputStreamReader(resourceInputStream, StandardCharsets.UTF_8));
         } catch (IOException e) {
             ServerMarket.getInstance().getLogger().log(Level.WARNING, e, () -> "Failed to load properties file.");
         }