feat: support loading NPCs and dialog configurations from subdirectories

Author: lt-name

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.smallaswater</groupId>
     <artifactId>RsNPC</artifactId>
-    <version>2.5.2<!-- -SNAPSHOT--></version>
+    <version>2.5.3-SNAPSHOT</version>
 
     <name>RsNPC</name>
     <description>RsNPC -- NPC plugin for Nukkit</description>

src/main/java/com/smallaswater/npc/RsNPC.java

@@ -44,7 +44,7 @@ public class RsNPC extends PluginBase {
             new ThreadPoolExecutor.DiscardPolicy());
     public static final Random RANDOM = new Random();
 
-    public static final String VERSION = "2.5.2";
+    public static final String VERSION = "2.5.3-SNAPSHOT";
 
     private static RsNPC rsNPC;
 
@@ -194,38 +194,47 @@ private void loadLanguage() {
     }
 
     private void loadNpcs() {
-        File[] files = (new File(getDataFolder() + "/Npcs")).listFiles();
-        if (files != null) {
-            for (File file : files) {
-                if (!file.isFile() && file.getName().endsWith(".yml")) {
-                    continue;
-                }
-                String npcName = file.getName().split("\\.")[0];
-                Config config;
-                try {
-                    config = new Config(file, Config.YAML);
-                }catch (Exception e) {
-                    this.getLogger().error(this.getLanguage().translateString("plugin.load.NPC.loadConfigError", npcName), e);
-                    continue;
-                }
-                RsNpcConfig rsNpcConfig;
-                try {
-                    rsNpcConfig = new RsNpcConfig(npcName, config);
-                } catch (Exception e) {
-                    this.getLogger().error(this.getLanguage().translateString("plugin.load.NPC.loadError", npcName), e);
-                    continue;
-                }
-                this.npcs.put(npcName, rsNpcConfig);
-                this.getLogger().info(this.getLanguage().translateString("plugin.load.NPC.loadComplete", rsNpcConfig.getName()));
-            }
-        }
+        File npcsFolder = new File(getDataFolder() + "/Npcs");
+        loadNpcsFromDirectory(npcsFolder);
         this.getServer().getScheduler().scheduleDelayedTask(this, () -> {
             for (RsNpcConfig config : this.npcs.values()) {
                 config.checkEntity();
             }
         }, 1);
     }
 
+    private void loadNpcsFromDirectory(File directory) {
+        if (!directory.exists() || !directory.isDirectory()) {
+            return;
+        }
+        File[] files = directory.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isDirectory()) {
+                    loadNpcsFromDirectory(file);
+                } else if (file.isFile() && file.getName().endsWith(".yml")) {
+                    String npcName = file.getName().split("\\.")[0];
+                    Config config;
+                    try {
+                        config = new Config(file, Config.YAML);
+                    }catch (Exception e) {
+                        this.getLogger().error(this.getLanguage().translateString("plugin.load.NPC.loadConfigError", npcName), e);
+                        continue;
+                    }
+                    RsNpcConfig rsNpcConfig;
+                    try {
+                        rsNpcConfig = new RsNpcConfig(npcName, config);
+                    } catch (Exception e) {
+                        this.getLogger().error(this.getLanguage().translateString("plugin.load.NPC.loadError", npcName), e);
+                        continue;
+                    }
+                    this.npcs.put(npcName, rsNpcConfig);
+                    this.getLogger().info(this.getLanguage().translateString("plugin.load.NPC.loadComplete", rsNpcConfig.getName()));
+                }
+            }
+        }
+    }
+
     /**
      * 加载内置皮肤
      */

src/main/java/com/smallaswater/npc/dialog/DialogManager.java

@@ -32,27 +32,37 @@ public DialogManager(@NotNull RsNPC rsNPC) {
 
     public void loadAllDialog() {
         this.dialogConfigs.clear();
+        File dialogFolder = new File(this.rsNPC.getDataFolder() + "/Dialog");
+        loadDialogFromDirectory(dialogFolder);
+        this.rsNPC.getLogger().info(this.rsNPC.getLanguage().translateString("plugin.load.dialog.loadComplete", this.dialogConfigs.size()));
+    }
 
-        File[] files = new File(this.rsNPC.getDataFolder() + "/Dialog").listFiles();
+    private void loadDialogFromDirectory(File directory) {
+        if (!directory.exists() || !directory.isDirectory()) {
+            return;
+        }
+        File[] files = directory.listFiles();
         if (files == null || files.length == 0) {
             return;
         }
         Arrays.stream(files)
-                .filter(File::isFile)
-                .filter(file -> file.getName().endsWith(".yml"))
                 .forEach(file -> {
-                    try {
-                        this.loadDialog(file.getName().split("\\.")[0]);
-                    } catch (Exception e) {
-                        this.rsNPC.getLogger().error(this.rsNPC.getLanguage().translateString("plugin.load.dialog.dataError", file.getName()), e);
+                    if (file.isDirectory()) {
+                        loadDialogFromDirectory(file);
+                    } else if (file.isFile() && file.getName().endsWith(".yml")) {
+                        try {
+                            String name = file.getName().split("\\.")[0];
+                            this.loadDialog(name, file);
+                        } catch (Exception e) {
+                            this.rsNPC.getLogger().error(this.rsNPC.getLanguage().translateString("plugin.load.dialog.dataError", file.getName()), e);
+                        }
                     }
                 });
-        this.rsNPC.getLogger().info(this.rsNPC.getLanguage().translateString("plugin.load.dialog.loadComplete", this.dialogConfigs.size()));
     }
 
-    public void loadDialog(@NotNull String name) {
-        Config config = new Config(this.rsNPC.getDataFolder() + "/Dialog/" + name + ".yml", Config.YAML);
-        ConfigUtils.addDescription(config, this.description); //添加描述
+    public void loadDialog(@NotNull String name, File file) {
+        Config config = new Config(file, Config.YAML);
+        ConfigUtils.addDescription(config, this.description);
         this.dialogConfigs.put(name, new DialogPages(name, config));
     }
 

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: RsNPC
 main: com.smallaswater.npc.RsNPC
-version: "2.5.2"
+version: "2.5.3-SNAPSHOT"
 api:
   - "Nukkit-MOT"
   - "Nukkit-PM1E"