supports yaml section when load action

MrXiaoM · MrXiaoM · commit add5dbed4f16 · 2026-03-14T11:21:50.000+08:00
with breaking changes
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionActionBar.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionActionBar.java
@@ -1,5 +1,6 @@
 package top.mrxiaom.pluginbase.actions;
 
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.api.IAction;
@@ -11,12 +12,28 @@
 import java.util.List;
 
 public class ActionActionBar implements IAction {
-    public static final IActionProvider PROVIDER = s -> {
-        if (s.startsWith("[actionbar]")) {
-            return new ActionActionBar(s.substring(11));
-        }
-        if (s.startsWith("actionbar:")) {
-            return new ActionActionBar(s.substring(10));
+    public static final IActionProvider PROVIDER = input -> {
+        if (input instanceof ConfigurationSection) {
+            ConfigurationSection section = (ConfigurationSection) input;
+            if (!section.contains("type") && section.contains("actionbar")) {
+                String message = section.getString("actionbar");
+                if (message != null) {
+                    return new ActionActionBar(message);
+                }
+            } else if ("actionbar".equals(section.getString("type"))) {
+                String message = section.getString("message");
+                if (message != null) {
+                    return new ActionActionBar(message);
+                }
+            }
+        } else {
+            String s = String.valueOf(input);
+            if (s.startsWith("[actionbar]")) {
+                return new ActionActionBar(s.substring(11));
+            }
+            if (s.startsWith("actionbar:")) {
+                return new ActionActionBar(s.substring(10));
+            }
         }
         return null;
     };
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionClose.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionClose.java
@@ -1,5 +1,6 @@
 package top.mrxiaom.pluginbase.actions;
 
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.api.IAction;
@@ -13,7 +14,20 @@ public class ActionClose implements IAction {
     public static final ActionClose INSTANCE;
     static {
         INSTANCE = new ActionClose();
-        PROVIDER = s -> s.equals("[close]") || s.equals("close") ? INSTANCE : null;
+        PROVIDER = input -> {
+            if (input instanceof ConfigurationSection) {
+                ConfigurationSection section = (ConfigurationSection) input;
+                if ("close".equals(section.getString("type"))) {
+                    return INSTANCE;
+                }
+            } else {
+                String s = String.valueOf(input);
+                if (s.equals("[close]") || s.equals("close")) {
+                    return INSTANCE;
+                }
+            }
+            return null;
+        };
     }
     private ActionClose() {
     }
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionConsole.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionConsole.java
@@ -1,6 +1,7 @@
 package top.mrxiaom.pluginbase.actions;
 
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.BukkitPlugin;
@@ -13,12 +14,28 @@
 import java.util.List;
 
 public class ActionConsole implements IAction {
-    public static final IActionProvider PROVIDER = s -> {
-        if (s.startsWith("[console]")) {
-            return new ActionConsole(s.substring(9));
-        }
-        if (s.startsWith("console:")) {
-            return new ActionConsole(s.substring(8));
+    public static final IActionProvider PROVIDER = input -> {
+        if (input instanceof ConfigurationSection) {
+            ConfigurationSection section = (ConfigurationSection) input;
+            if (!section.contains("type") && section.contains("console")) {
+                String command = section.getString("console");
+                if (command != null) {
+                    return new ActionConsole(command);
+                }
+            } else if ("console".equals(section.getString("type"))) {
+                String command = section.getString("command");
+                if (command != null) {
+                    return new ActionConsole(command);
+                }
+            }
+        } else {
+            String s = String.valueOf(input);
+            if (s.startsWith("[console]")) {
+                return new ActionConsole(s.substring(9));
+            }
+            if (s.startsWith("console:")) {
+                return new ActionConsole(s.substring(8));
+            }
         }
         return null;
     };
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionDelay.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionDelay.java
@@ -1,5 +1,6 @@
 package top.mrxiaom.pluginbase.actions;
 
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.api.IAction;
@@ -10,12 +11,28 @@
 import java.util.List;
 
 public class ActionDelay implements IAction {
-    public static final IActionProvider PROVIDER = s -> {
-        if (s.startsWith("[delay]")) {
-            return Util.parseInt(s.substring(7)).map(ActionDelay::new).orElse(null);
-        }
-        if (s.startsWith("delay:")) {
-            return Util.parseInt(s.substring(6)).map(ActionDelay::new).orElse(null);
+    public static final IActionProvider PROVIDER = input -> {
+        if (input instanceof ConfigurationSection) {
+            ConfigurationSection section = (ConfigurationSection) input;
+            if (!section.contains("type") && section.contains("delay")) {
+                int delay = section.getInt("delay");
+                if (delay > 0) {
+                    return new ActionDelay(delay);
+                }
+            } else if ("delay".equals(section.getString("type"))) {
+                int delay = section.getInt("delay");
+                if (delay > 0) {
+                    return new ActionDelay(delay);
+                }
+            }
+        } else {
+            String s = String.valueOf(input);
+            if (s.startsWith("[delay]")) {
+                return Util.parseInt(s.substring(7)).map(ActionDelay::new).orElse(null);
+            }
+            if (s.startsWith("delay:")) {
+                return Util.parseInt(s.substring(6)).map(ActionDelay::new).orElse(null);
+            }
         }
         return null;
     };
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionMessage.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionMessage.java
@@ -1,6 +1,7 @@
 package top.mrxiaom.pluginbase.actions;
 
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.api.IAction;
@@ -13,12 +14,28 @@
 import static top.mrxiaom.pluginbase.func.AbstractPluginHolder.t;
 
 public class ActionMessage implements IAction {
-    public static final IActionProvider PROVIDER = s -> {
-        if (s.startsWith("[message]")) {
-            return new ActionMessage(s.substring(9));
-        }
-        if (s.startsWith("message:")) {
-            return new ActionMessage(s.substring(8));
+    public static final IActionProvider PROVIDER = input -> {
+        if (input instanceof ConfigurationSection) {
+            ConfigurationSection section = (ConfigurationSection) input;
+            if (!section.contains("type") && section.contains("message")) {
+                String content = section.getString("message");
+                if (content != null) {
+                    return new ActionMessage(content);
+                }
+            } else if ("message".equals(section.getString("type"))) {
+                String content = section.getString("content");
+                if (content != null) {
+                    return new ActionMessage(content);
+                }
+            }
+        } else {
+            String s = String.valueOf(input);
+            if (s.startsWith("[message]")) {
+                return new ActionMessage(s.substring(9));
+            }
+            if (s.startsWith("message:")) {
+                return new ActionMessage(s.substring(8));
+            }
         }
         return null;
     };
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionMessageAdventure.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionMessageAdventure.java
@@ -1,6 +1,7 @@
 package top.mrxiaom.pluginbase.actions;
 
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.api.IAction;
@@ -12,12 +13,28 @@
 import java.util.List;
 
 public class ActionMessageAdventure implements IAction {
-    public static final IActionProvider PROVIDER = s -> {
-        if (s.startsWith("[message]")) {
-            return new ActionMessageAdventure(s.substring(9));
-        }
-        if (s.startsWith("message:")) {
-            return new ActionMessageAdventure(s.substring(8));
+    public static final IActionProvider PROVIDER = input -> {
+        if (input instanceof ConfigurationSection) {
+            ConfigurationSection section = (ConfigurationSection) input;
+            if (!section.contains("type") && section.contains("message")) {
+                String content = section.getString("message");
+                if (content != null) {
+                    return new ActionMessageAdventure(content);
+                }
+            } else if ("message".equals(section.getString("type"))) {
+                String content = section.getString("content");
+                if (content != null) {
+                    return new ActionMessageAdventure(content);
+                }
+            }
+        } else {
+            String s = String.valueOf(input);
+            if (s.startsWith("[message]")) {
+                return new ActionMessageAdventure(s.substring(9));
+            }
+            if (s.startsWith("message:")) {
+                return new ActionMessageAdventure(s.substring(8));
+            }
         }
         return null;
     };
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionPlayer.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionPlayer.java
@@ -1,5 +1,6 @@
 package top.mrxiaom.pluginbase.actions;
 
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import top.mrxiaom.pluginbase.BukkitPlugin;
@@ -12,12 +13,28 @@
 import java.util.List;
 
 public class ActionPlayer implements IAction {
-    public static final IActionProvider PROVIDER = s -> {
-        if (s.startsWith("[player]")) {
-            return new ActionPlayer(s.substring(8));
-        }
-        if (s.startsWith("player:")) {
-            return new ActionPlayer(s.substring(7));
+    public static final IActionProvider PROVIDER = input -> {
+        if (input instanceof ConfigurationSection) {
+            ConfigurationSection section = (ConfigurationSection) input;
+            if (!section.contains("type") && section.contains("player")) {
+                String command = section.getString("player");
+                if (command != null) {
+                    return new ActionPlayer(command);
+                }
+            } else if ("player".equals(section.getString("type"))) {
+                String command = section.getString("command");
+                if (command != null) {
+                    return new ActionPlayer(command);
+                }
+            }
+        } else {
+            String s = String.valueOf(input);
+            if (s.startsWith("[player]")) {
+                return new ActionPlayer(s.substring(8));
+            }
+            if (s.startsWith("player:")) {
+                return new ActionPlayer(s.substring(7));
+            }
         }
         return null;
     };
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionProviders.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/actions/ActionProviders.java
@@ -7,6 +7,7 @@
 import top.mrxiaom.pluginbase.BukkitPlugin;
 import top.mrxiaom.pluginbase.api.IAction;
 import top.mrxiaom.pluginbase.api.IActionProvider;
+import top.mrxiaom.pluginbase.utils.ConfigUtils;
 import top.mrxiaom.pluginbase.utils.Pair;
 
 import java.util.*;
@@ -34,23 +35,23 @@ public static void registerBuiltInActions(BukkitPlugin plugin) {
 
     @NotNull
     public static List<IAction> loadActions(@NotNull ConfigurationSection section, @NotNull String key) {
-        return loadActions(section.getStringList(key));
+        return loadActions(ConfigUtils.getList(section, key));
     }
 
     @NotNull
     public static List<IAction> loadActions(@NotNull ConfigurationSection section, @NotNull String... keys) {
-        List<String> list = new ArrayList<>();
+        List<Object> list = new ArrayList<>();
         for (String key : keys) {
-            list.addAll(section.getStringList(key));
+            list.addAll(ConfigUtils.getList(section, key));
         }
         if (list.isEmpty()) return new ArrayList<>();
         return loadActions(list);
     }
 
     @NotNull
-    public static List<IAction> loadActions(@NotNull List<String> list) {
+    public static List<IAction> loadActions(@NotNull List<Object> list) {
         List<IAction> actions = new ArrayList<>();
-        for (String s : list) {
+        for (Object s : list) {
             IAction action = loadAction(s);
             if (action != null) {
                 actions.add(action);
@@ -60,7 +61,7 @@ public static List<IAction> loadActions(@NotNull List<String> list) {
     }
 
     @Nullable
-    public static IAction loadAction(@Nullable String s) {
+    public static IAction loadAction(@Nullable Object s) {
         if (s == null) return null;
         for (IActionProvider provider : actionProviders) {
             IAction action = provider.provide(s);
diff --git a/modules/actions/src/main/java/top/mrxiaom/pluginbase/api/IActionProvider.java b/modules/actions/src/main/java/top/mrxiaom/pluginbase/api/IActionProvider.java
@@ -9,9 +9,10 @@
 public interface IActionProvider {
     /**
      * IAction 提供器，返回 null 代表字符串不匹配当前 Action
+     * @param input 输入值，可能是字符串，也可能是 {@link org.bukkit.configuration.ConfigurationSection}
      */
     @Nullable
-    IAction provide(@NotNull String s);
+    IAction provide(@NotNull Object input);
 
     /**
      * 处理优先级，数字越小越先处理
@@ -21,11 +22,11 @@ default int priority() {
     }
 
     @NotNull
-    static IActionProvider newProvider(int priority, @NotNull Function<String, IAction> function) {
+    static IActionProvider newProvider(int priority, @NotNull Function<Object, IAction> function) {
         return new IActionProvider() {
             @Override
-            public @Nullable IAction provide(@NotNull String s) {
-                return function.apply(s);
+            public @Nullable IAction provide(@NotNull Object input) {
+                return function.apply(input);
             }
 
             @Override
