Merge branch 'main' of https://github.com/MinecraftChampions/DodoOpen…

…Java
MinecraftChampions · Oct 14, 2023 · 62eaaf7 · 62eaaf7
2 parents 03f3b6b + 850e8bc
commit 62eaaf7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/core/src/main/java/io/github/minecraftchampions/dodoopenjava/card/component/Component.java b/core/src/main/java/io/github/minecraftchampions/dodoopenjava/card/component/Component.java
@@ -2,10 +2,12 @@
 
 import org.json.JSONObject;
 
+import java.io.Serializable;
+
 /**
  * 组件
  */
-public class Component {
+public abstract class Component implements Serializable {
     protected JSONObject jsonCard = new JSONObject();
 
     /**

diff --git a/...ions/src/main/java/io/github/minecraftchampions/dodoopenjava/permissions/Permissions.java b/...ions/src/main/java/io/github/minecraftchampions/dodoopenjava/permissions/Permissions.java
@@ -8,7 +8,7 @@
  * 权限系统核心
  */
 public class Permissions {
-    public static PermData permData = new PermData();
+    public static PermData permData = null;
     public static DataType type;
 
     public static boolean initialized;
@@ -89,16 +89,8 @@ public void run() {
             while (true) {
                 try {
                     Thread.sleep(10 * 60 * 60);
-                    switch (Permissions.type.getType()) {
-                        case "YAML" -> permData.saveToFile();
-                        case "JSON" -> permData.saveToFile();
-                        case "Xml" -> permData.saveToFile();
-                        case "Toml" -> permData.saveToFile();
-                        default -> System.err.println("错误的存储种类");
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                } catch (IOException e) {
+                    permData.saveToFile();
+                } catch (IOException | InterruptedException e) {
                     throw new RuntimeException(e);
                 }
             }

diff --git a/...ns/src/main/java/io/github/minecraftchampions/dodoopenjava/permissions/data/PermData.java b/...ns/src/main/java/io/github/minecraftchampions/dodoopenjava/permissions/data/PermData.java
@@ -6,10 +6,9 @@
 /**
  * 存储实例
  */
-public class PermData {
+public abstract class PermData {
     public File User;
     public File Group;
 
-    public void saveToFile() throws IOException {
-    }
+    public abstract void saveToFile() throws IOException;
 }
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <revision>2.5.11</revision>
+        <revision>2.5.12</revision>
     </properties>
 
     <groupId>io.github.minecraftchampions.dodoopenjava</groupId>