build(deps): 改用 spigot-api

close #6

README.md

@@ -27,7 +27,7 @@
 
 ## 内容
 
-项目初创不久，加 * 的仍在开发更新中...
+项目初创不久，加 * 的仍在开发更新中...欢迎各路大佬帮助提供本项目的开发文档~
 
 ### 集合部分 (`/collection`)
 
@@ -37,11 +37,25 @@
 ### 主要部分 (`/base`)
 
 - Main [`easyplugin-main`](base/main)
+  -  主要接口模块，提供了方便的插件入口类与相关工具类。
 - Command [`easyplugin-command`](base/command)
-- ~~Messages*~~ (已独立项目到 [**EasyMessages**](https://github.com/CarmJos/EasyMessages))
+  - 指令接口模块，便于快速进行子指令的实现，并提供单独的TabComplete方法。
-- ~~Configuration~~ (已独立项目到 [**MineConfiguration**](https://github.com/CarmJos/MineConfiguration))
+  - 随本项目提供了 `SimpleCompleter` 类，用于快速创建补全的内容列表。
-- ~~Database~~ (已独立项目到 [**EasySQL**](https://github.com/CarmJos/EasySQL))
 - GUI [`easyplugin-gui`](base/main)
+  - 简单便捷的箱子GUI接口，可以快速实现GUI中不同图标的点击功能。
+  - 随本项目提供了 `AutoPagedGUI` 等翻页GUI抽象类。
+- Storage [`easyplugin-storage`](base/storage)
+  - 抽象存储管理器，便于实现不同的存储类型。 
+  - 随本项目提供了 `FileBasedStorage`、`FolderBasedStorage` 等常用存储抽象方法。
+
+> 以下项目均已独立出单独项目，仅仅是按照包名规则打包到EasyPlugin的子项目中。
+> 
+> 如需使用，**强烈建议自行引用对应的项目**，以支持完整的Javadoc并获取源码内容！
+
+- _Listener_ [`easyplugin-listener`](base/listener) (打包自 [**EasyListener**](https://github.com/CarmJos/EasyListener))
+- _Configuration_ [`easyplugin-conf`](base/conf) (打包自 [**MineConfiguration**](https://github.com/CarmJos/MineConfiguration))
+- _Database_ [`easyplugin-database`](base/database)  (打包自 [**EasySQL**](https://github.com/CarmJos/EasySQL))
+- _Messages*_ [`easyplugin-message`](base/message) (打包自 [**EasyMessages**](https://github.com/CarmJos/EasyMessages))
 
 ### 附属部分 (`/extension`)
 

base/command/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java

@@ -11,13 +11,14 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@SuppressWarnings("UnusedReturnValue")
 public abstract class CommandHandler implements TabExecutor, NamedExecutor {
 
     protected final @NotNull JavaPlugin plugin;
     protected final @NotNull String cmd;
     protected final @NotNull List<String> aliases;
 
-    protected final @NotNull Map<String, SubCommand> registeredCommands = new HashMap<>();
+    protected final @NotNull Map<String, SubCommand<?>> registeredCommands = new HashMap<>();
     protected final @NotNull Map<String, CommandHandler> registeredHandlers = new HashMap<>();
 
     protected final @NotNull Map<String, String> aliasesMap = new HashMap<>();
@@ -36,13 +37,18 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
         this.aliases = Arrays.asList(aliases);
     }
 
-    public abstract void noArgs(CommandSender sender);
+    public abstract Void noArgs(CommandSender sender);
 
-    public void unknownCommand(CommandSender sender, String[] args) {
+    public Void unknownCommand(CommandSender sender, String[] args) {
-        noArgs(sender);
+        return noArgs(sender);
     }
 
-    public abstract void noPermission(CommandSender sender);
+    public abstract Void noPermission(CommandSender sender);
+
+    public Void onException(CommandSender sender, SubCommand<?> cmd, Exception ex) {
+        sender.sendMessage("Error occurred when executing " + cmd.getName() + ": " + ex.getLocalizedMessage());
+        return null;
+    }
 
     @Override
     public @NotNull List<String> getAliases() {
@@ -54,7 +60,7 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
         return this.cmd;
     }
 
-    public void registerSubCommand(SubCommand command) {
+    public void registerSubCommand(SubCommand<?> command) {
         String name = command.getName().toLowerCase();
         this.registeredCommands.put(name, command);
         command.getAliases().forEach(alias -> this.aliasesMap.put(alias.toLowerCase(), name));
@@ -82,16 +88,18 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
                 }
             }
 
-            SubCommand subCommand = getSubCommand(input);
+            SubCommand<?> sub = getSubCommand(input);
-            if (subCommand == null) {
+            if (sub == null) {
                 this.unknownCommand(sender, args);
-            } else if (!subCommand.hasPermission(sender)) {
+            } else if (!sub.hasPermission(sender)) {
                 this.noPermission(sender);
             } else {
                 try {
-                    subCommand.execute(this.plugin, sender, this.shortenArgs(args));
+                    sub.execute(this.plugin, sender, this.shortenArgs(args));
-                } catch (ArrayIndexOutOfBoundsException var9) {
+                } catch (ArrayIndexOutOfBoundsException ex) {
                     this.unknownCommand(sender, args);
+                } catch (Exception ex) {
+                    this.onException(sender, sub, ex);
                 }
             }
 
@@ -117,9 +125,9 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
                 return handler.onTabComplete(sender, command, alias, this.shortenArgs(args));
             }
 
-            SubCommand subCommand = getSubCommand(input);
+            SubCommand<?> sub = getSubCommand(input);
-            if (subCommand != null && subCommand.hasPermission(sender)) {
+            if (sub != null && sub.hasPermission(sender)) {
-                return subCommand.tabComplete(this.plugin, sender, this.shortenArgs(args));
+                return sub.tabComplete(this.plugin, sender, this.shortenArgs(args));
             }
 
             return Collections.emptyList();
@@ -144,8 +152,8 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
         else return this.registeredHandlers.get(nameFromAlias);
     }
 
-    protected @Nullable SubCommand getSubCommand(@NotNull String name) {
+    protected @Nullable SubCommand<?> getSubCommand(@NotNull String name) {
-        SubCommand fromName = this.registeredCommands.get(name);
+        SubCommand<?> fromName = this.registeredCommands.get(name);
         if (fromName != null) return fromName;
 
         String nameFromAlias = this.aliasesMap.get(name);

base/command/src/main/java/cc/carm/lib/easyplugin/command/NamedExecutor.java

@@ -1,7 +1,6 @@
 package cc.carm.lib.easyplugin.command;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permissible;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,7 +15,7 @@ public interface NamedExecutor {
 
     List<String> getAliases();
 
-    default boolean hasPermission(Permissible permissible) {
+    default boolean hasPermission(CommandSender sender) {
         return true;
     }
 

base/command/src/main/java/cc/carm/lib/easyplugin/command/SubCommand.java

@@ -2,37 +2,46 @@ package cc.carm.lib.easyplugin.command;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 @SuppressWarnings("UnusedReturnValue")
-public abstract class SubCommand implements NamedExecutor {
+public abstract class SubCommand<C extends CommandHandler> implements NamedExecutor {
+
+    private final @NotNull C parent;
 
     private final String name;
     private final List<String> aliases;
 
-    public SubCommand(String name, String... aliases) {
+    public SubCommand(@NotNull C parent, String name, String... aliases) {
+        this.parent = parent;
         this.name = name;
         this.aliases = Arrays.asList(aliases);
     }
 
+    public @NotNull C getParent() {
+        return parent;
+    }
+
     @Override
     public String getName() {
         return this.name;
     }
 
     @Override
+    @Unmodifiable
     public List<String> getAliases() {
         return this.aliases;
     }
 
-    public abstract Void execute(JavaPlugin plugin, CommandSender sender, String[] args);
+    public abstract Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception;
 
     public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
         return Collections.emptyList();
     }
 
-
 }

base/conf/pom.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>easyplugin-parent</artifactId>
+        <groupId>cc.carm.lib</groupId>
+        <version>1.4.15</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven.compiler.source>${project.jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${project.jdk.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+    <artifactId>easyplugin-conf</artifactId>
+    <packaging>jar</packaging>
+
+    <name>EasyPlugin-Configuration</name>
+    <description>轻松插件配置文件接口模块，基于 MineConfiguration 项目。</description>
+    <url>https://github.com/CarmJos/EasyPlugin</url>
+
+    <dependencies>
+        <dependency>
+            <!-- https://github.com/CarmJos/MineConfiguration -->
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>mineconfiguration-bukkit</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>cc.carm.lib.configuration.core</pattern>
+                            <shadedPattern>cc.carm.lib.easyplugin.conf</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>cc.carm.lib.mineconfiguration.common</pattern>
+                            <shadedPattern>cc.carm.lib.easyplugin.conf</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>cc.carm.lib.mineconfiguration.bukkit</pattern>
+                            <shadedPattern>cc.carm.lib.easyplugin.conf</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
+                                <exclude>META-INF/*.txt</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

base/database/pom.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>easyplugin-parent</artifactId>
+        <groupId>cc.carm.lib</groupId>
+        <version>1.4.15</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven.compiler.source>${project.jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${project.jdk.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+    <artifactId>easyplugin-database</artifactId>
+    <packaging>jar</packaging>
+
+    <name>EasyPlugin-Database</name>
+    <description>轻松插件数据库接口模块，基于 EasySQL 项目。</description>
+    <url>https://github.com/CarmJos/EasyPlugin</url>
+
+    <dependencies>
+        <dependency>
+            <!-- https://github.com/CarmJos/EasySQL -->
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easysql-beecp</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>cc.carm.lib.easysql</pattern>
+                            <shadedPattern>cc.carm.lib.easyplugin.database</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
+                                <exclude>META-INF/*.txt</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

base/gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java

@@ -13,10 +13,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import java.util.stream.IntStream;
 
 public class GUI {
@@ -56,9 +53,9 @@ public class GUI {
      */
     boolean cancelOnOuter = true;
 
-    Map<String, Object> flags;
+    protected final Map<String, Object> flags = new LinkedHashMap<>();
 
-    GUIListener listener;
+    protected GUIListener listener;
 
     public GUI(GUIType type, String name) {
         this.type = type;
@@ -131,24 +128,15 @@ public class GUI {
         this.cancelOnOuter = b;
     }
 
-    public void addFlag(String flag, Object obj) {
-        if (this.flags == null) this.flags = new HashMap<>();
-        this.flags.put(flag, obj);
-    }
-
     public Object getFlag(String flag) {
-        if (this.flags == null) return null;
+        return this.flags.get(flag);
-        else
-            return this.flags.get(flag);
     }
 
     public void setFlag(String flag, Object obj) {
-        if (this.flags == null) this.flags = new HashMap<>();
+        this.flags.put(flag, obj);
-        this.flags.replace(flag, obj);
     }
 
     public void removeFlag(String flag) {
-        if (this.flags == null) this.flags = new HashMap<>();
         this.flags.remove(flag);
     }
 
@@ -193,6 +181,13 @@ public class GUI {
     public void onClose() {
     }
 
+    public GUIType getGUIType() {
+        return type;
+    }
+
+    public String getGUIName() {
+        return name;
+    }
 
     public static void setOpenedGUI(Player player, GUI gui) {
         getOpenedGUIs().put(player.getUniqueId(), gui);

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIItem.java

@@ -37,12 +37,24 @@ public class GUIItem {
     }
 
     /**
-     * 玩家点击GUI后执行的代码
+     * 玩家点击该物品后执行的代码
+     * 可以使用 {@link #onClick(Player, ClickType)} 操作点击者
      *
      * @param type 点击的类型
      */
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
     public void onClick(ClickType type) {
+    }
 
+    /**
+     * 玩家点击GUI后执行的代码
+     *
+     * @param clicker 点击的玩家
+     * @param type    点击的类型
+     */
+    public void onClick(Player clicker, ClickType type) {
+        this.onClick(type); // Deprecated method support
     }
 
     public void addClickAction(GUIClickAction action) {
@@ -58,7 +70,7 @@ public class GUIItem {
     }
 
     /**
-     * 玩家点击GUI后执行的代码
+     * 自定义点击事件代码 (须自行触发)
      *
      * @param player 点击GUI的玩家
      */

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java

@@ -45,7 +45,7 @@ public class GUIListener implements Listener {
                 GUIItem clickedItem = getCurrentGUI().getItem(event.getSlot());
                 if (clickedItem != null) {
                     if (clickedItem.isActionActive()) {
-                        clickedItem.onClick(event.getClick());
+                        clickedItem.onClick(player, event.getClick());
                         clickedItem.rawClickAction(event);
                         clickedItem.actions.forEach(action -> action.run(event.getClick(), player));
                     }

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIType.java

@@ -14,8 +14,8 @@ public enum GUIType {
     SIX_BY_NINE(6, 54),
     CANCEL(0, 0);
 
-    int lines;
+    private final int lines;
-    int size;
+    private final int size;
 
     GUIType(int lines, int size) {
         this.lines = lines;

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/configuration/GUIItemConfiguration.java

@@ -2,11 +2,14 @@ package cc.carm.lib.easyplugin.gui.configuration;
 
 import cc.carm.lib.easyplugin.gui.GUI;
 import cc.carm.lib.easyplugin.gui.GUIItem;
+import cc.carm.lib.easyplugin.utils.ColorParser;
 import cc.carm.lib.easyplugin.utils.ItemStackFactory;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -15,6 +18,8 @@ import java.util.stream.Collectors;
 
 public class GUIItemConfiguration {
 
+    @Nullable ItemStack original;
+
     @NotNull Material type;
     int amount;
     int data;
@@ -28,6 +33,15 @@ public class GUIItemConfiguration {
                                 @Nullable String name, @NotNull List<String> lore,
                                 @NotNull List<GUIActionConfiguration> actions,
                                 @NotNull List<Integer> slots) {
+        this(null, type, amount, data, name, lore, actions, slots);
+    }
+
+    public GUIItemConfiguration(@Nullable ItemStack original,
+                                @NotNull Material type, int amount, int data,
+                                @Nullable String name, @NotNull List<String> lore,
+                                @NotNull List<GUIActionConfiguration> actions,
+                                @NotNull List<Integer> slots) {
+        this.original = original;
         this.type = type;
         this.amount = amount;
         this.data = data;
@@ -38,22 +52,58 @@ public class GUIItemConfiguration {
     }
 
     public void setupItems(Player player, GUI gui) {
-        ItemStackFactory icon = new ItemStackFactory(this.type, this.amount, this.data);
+        ItemStack itemStack;
-        if (this.name != null) icon.setDisplayName(this.name);
+        if (original != null) {
-        icon.setLore(MessageUtils.setPlaceholders(player, this.lore));
+            ItemStack tmp = original.clone();
+            ItemMeta originalMeta = original.getItemMeta();
+            if (originalMeta != null) {
+                if (originalMeta.hasDisplayName()) {
+                    originalMeta.setDisplayName(parseText(player, originalMeta.getDisplayName()));
+                }
+                if (originalMeta.getLore() != null) {
+                    originalMeta.setLore(parseTexts(player, originalMeta.getLore()));
+                }
 
-        GUIItem item = new GUIItem(icon.toItemStack());
+            }
+
+            tmp.setItemMeta(originalMeta);
+            itemStack = tmp;
+        } else {
+            ItemStackFactory icon = new ItemStackFactory(this.type, this.amount, this.data);
+            if (this.name != null) {
+                icon.setDisplayName(parseText(player, this.name));
+            }
+            if (!this.lore.isEmpty()) {
+                icon.setLore(parseTexts(player, this.lore));
+            }
+            itemStack = icon.toItemStack();
+        }
+
+
+        GUIItem item = new GUIItem(itemStack);
         this.actions.stream().map(GUIActionConfiguration::toClickAction).forEach(item::addClickAction);
         this.slots.forEach(slot -> gui.setItem(slot, item));
     }
 
+    private List<String> parseTexts(Player player, List<String> lore) {
+        return ColorParser.parse(MessageUtils.setPlaceholders(player, lore));
+    }
+
+    @NotNull
+    private String parseText(Player player, @NotNull String name) {
+        return ColorParser.parse(MessageUtils.setPlaceholders(player, name));
+    }
+
     public @NotNull Map<String, Object> serialize() {
         LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        if (original != null) map.put("original", original);
+        else {
+            map.put("type", this.type.name());
+            if (this.data != 0) map.put("data", this.data);
+        }
 
-        map.put("type", this.type.name());
         if (this.name != null) map.put("name", this.name);
         if (this.amount != 1) map.put("amount", this.amount);
-        if (this.data != 0) map.put("data", this.data);
         if (!this.lore.isEmpty()) map.put("lore", this.lore);
         if (this.slots.size() > 1) {
             map.put("slots", this.slots);
@@ -69,6 +119,10 @@ public class GUIItemConfiguration {
     @Nullable
     public static GUIItemConfiguration readFrom(@Nullable ConfigurationSection itemSection) {
         if (itemSection == null) return null;
+
+        ItemStack original = null;
+        if (itemSection.contains("original")) original = itemSection.getItemStack("original");
+
         String material = Optional.ofNullable(itemSection.getString("type")).orElse("STONE");
         Material type = Optional.ofNullable(Material.matchMaterial(material)).orElse(Material.STONE);
         int data = itemSection.getInt("data", 0);
@@ -88,7 +142,7 @@ public class GUIItemConfiguration {
         }
 
         return new GUIItemConfiguration(
-                type, amount, data, name, lore, actions,
+                original, type, amount, data, name, lore, actions,
                 slots.size() > 0 ? slots : Collections.singletonList(slot)
         );
     }

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/AutoPagedGUI.java

@@ -49,7 +49,7 @@ public class AutoPagedGUI extends CommonPagedGUI {
                 setItem(previousPageSlot, new GUIItem(
                         previousPageUI == null ? getDefaultPreviousPage(user) : previousPageUI) {
                     @Override
-                    public void onClick(ClickType type) {
+                    public void onClick(Player clicker, ClickType type) {
                         if (type == ClickType.RIGHT) {
                             goFirstPage();
                         } else {
@@ -68,7 +68,7 @@ public class AutoPagedGUI extends CommonPagedGUI {
                 setItem(nextPageSlot, new GUIItem(
                         nextPageUI == null ? getDefaultNextPage(user) : nextPageUI) {
                     @Override
-                    public void onClick(ClickType type) {
+                    public void onClick(Player clicker, ClickType type) {
                         if (type == ClickType.RIGHT) {
                             goLastPage();
                         } else {

base/listener/pom.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>easyplugin-parent</artifactId>
+        <groupId>cc.carm.lib</groupId>
+        <version>1.4.15</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven.compiler.source>${project.jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${project.jdk.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+    <artifactId>easyplugin-listener</artifactId>
+
+    <name>EasyPlugin-Listener</name>
+    <description>轻松插件监听器接口模块，基于 EasyListener 项目。</description>
+    <url>https://github.com/CarmJos/EasyPlugin</url>
+
+    <licenses>
+        <license>
+            <name>GNU LESSER GENERAL PUBLIC LICENSE</name>
+            <url>https://www.gnu.org/licenses/lgpl-3.0.html</url>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <!-- https://github.com/CarmJos/EasyListener -->
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easylistener</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>cc.carm.lib.easylistener</pattern>
+                            <shadedPattern>cc.carm.lib.easyplugin.listener</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
+                                <exclude>META-INF/*.txt</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

base/main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java

@@ -145,6 +145,13 @@ public abstract class EasyPlugin extends JavaPlugin {
         if (isDebugging()) print("&8[DEBUG] &r", messages);
     }
 
+    /**
+     * 在主线程唤起一个事件，并支持获取事件的结果。
+     *
+     * @param event 同步事件 (isAsync=false)
+     * @param <T>   事件类型
+     * @return CompletableFuture
+     */
     public @NotNull <T extends Event> CompletableFuture<T> callSync(T event) {
         CompletableFuture<T> future = new CompletableFuture<>();
         getScheduler().run(() -> {
@@ -154,11 +161,24 @@ public abstract class EasyPlugin extends JavaPlugin {
         return future;
     }
 
+    /**
+     * 在异步线程中唤起一个事件，并支持获取事件的结果。
+     *
+     * @param event 异步事件 (isAsync=true)
+     * @param <T>   事件类型
+     * @return CompletableFuture
+     */
     public @NotNull <T extends Event> CompletableFuture<T> callAsync(T event) {
-        return CompletableFuture.supplyAsync(() -> {
+        CompletableFuture<T> future = new CompletableFuture<>();
+        getScheduler().runAsync(() -> {
             Bukkit.getPluginManager().callEvent(event);
-            return event;
+            future.complete(event);
         });
+        return future;
+    }
+
+    protected void setMessageProvider(@NotNull EasyPluginMessageProvider provider) {
+        this.messageProvider = provider;
     }
 
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")

base/main/src/main/java/cc/carm/lib/easyplugin/utils/EasyCooldown.java

@@ -0,0 +1,104 @@
+package cc.carm.lib.easyplugin.utils;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.text.NumberFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * <a href="https://gist.github.com/CarmJos/402cb5aad0ec14ab25c2fa0d21571703">Easy cooldown time utils.</a>
+ *
+ * @param <P> Cooldown key provider
+ * @param <K> Cooldown key
+ * @author CarmJos
+ */
+public class EasyCooldown<P, K> {
+
+    protected final NumberFormat numberFormatter;
+
+    protected final @NotNull Map<K, Long> cooldown = new HashMap<>();
+    protected final @NotNull Function<P, K> providerToKey;
+
+    protected long defaultDuration;
+
+    public EasyCooldown(@NotNull Function<P, K> providerToKey) {
+        this(defaultFormatter(), providerToKey, 1000L);
+    }
+
+    public EasyCooldown(@NotNull NumberFormat numberFormatter,
+                        @NotNull Function<P, K> providerToKey) {
+        this(numberFormatter, providerToKey, 1000L);
+    }
+
+    public EasyCooldown(@NotNull NumberFormat numberFormatter,
+                        @NotNull Function<P, K> providerToKey,
+                        long defaultDuration) {
+        this.numberFormatter = numberFormatter;
+        this.providerToKey = providerToKey;
+        this.defaultDuration = defaultDuration;
+    }
+
+    public long getCooldown(@NotNull P provider) {
+        Long time = this.cooldown.get(this.providerToKey.apply(provider));
+        if (time == null || time < 0) return 0;
+
+        long duration = getDuration(provider);
+        if (duration <= 0) return 0;
+
+        long past = System.currentTimeMillis() - time;
+        return duration - past;
+    }
+
+    public @NotNull String getCooldownSeconds(@NotNull P provider) {
+        return formatSeconds(getCooldown(provider));
+    }
+
+    public void updateTime(@NotNull P provider) {
+        this.cooldown.put(this.providerToKey.apply(provider), System.currentTimeMillis());
+    }
+
+    public void clear(@NotNull P provider) {
+        clearCooldown(this.providerToKey.apply(provider));
+    }
+
+    public void clearCooldown(@NotNull K key) {
+        this.cooldown.remove(key);
+    }
+
+    public boolean isCoolingDown(@NotNull P provider) {
+        return getCooldown(provider) > 0;
+    }
+
+    public long getDuration(@NotNull P provider) {
+        return this.defaultDuration;
+    }
+
+    public @NotNull String formatSeconds(long cooldownMillis) {
+        return numberFormatter.format((double) cooldownMillis / 1000D);
+    }
+
+    public static NumberFormat createFormatter(Consumer<NumberFormat> consumer) {
+        NumberFormat format = NumberFormat.getInstance();
+        consumer.accept(format);
+        return format;
+    }
+
+    public static NumberFormat defaultFormatter() {
+        return createFormatter((f) -> f.setMaximumFractionDigits(2));
+    }
+
+    public static EasyCooldown<Player, UUID> playerCooldown(Function<Player, Long> durationProvider) {
+        return new EasyCooldown<Player, UUID>(Player::getUniqueId) {
+            @Override
+            public long getDuration(@NotNull Player provider) {
+                return durationProvider.apply(provider);
+            }
+        };
+    }
+
+}

base/storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -52,6 +52,7 @@
 
     <dependencyManagement>
         <dependencies>
+
             <dependency>
                 <groupId>${project.parent.groupId}</groupId>
                 <artifactId>easyplugin-main</artifactId>
@@ -67,6 +68,27 @@
                 <artifactId>easyplugin-gui</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.parent.groupId}</groupId>
+                <artifactId>easyplugin-storage</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.parent.groupId}</groupId>
+                <artifactId>easyplugin-listener</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.parent.groupId}</groupId>
+                <artifactId>easyplugin-database</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.parent.groupId}</groupId>
+                <artifactId>easyplugin-conf</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>${project.parent.groupId}</groupId>
                 <artifactId>easyplugin-papi</artifactId>
@@ -77,6 +99,13 @@
                 <artifactId>easyplugin-vault</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>${project.parent.groupId}</groupId>
+                <artifactId>easyplugin-githubchecker</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

collection/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -68,6 +68,14 @@
                     <groupId>cc.carm.lib</groupId>
                     <artifactId>easyplugin-vault</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>cc.carm.lib</groupId>
+                    <artifactId>easyplugin-database</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>cc.carm.lib</groupId>
+                    <artifactId>easyplugin-storage</artifactId>
+                </exclusion>
             </exclusions>
 
         </dependency>

extension/gh-checker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/papi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.11</version>
+        <version>1.4.15</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,12 +15,16 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.11</version>
+    <version>1.4.15</version>
     <modules>
 
         <module>base/main</module>
-        <module>base/command</module>
+        <module>base/conf</module>
         <module>base/gui</module>
+        <module>base/command</module>
+        <module>base/storage</module>
+        <module>base/listener</module>
+        <module>base/database</module>
 
         <module>extension/papi</module>
         <module>extension/vault</module>
@@ -29,7 +33,6 @@
         <module>collection/all</module>
         <module>collection/bom</module>
         <module>collection/common</module>
-        <module>base/storage</module>
 
     </modules>
 
@@ -103,7 +106,7 @@
 
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
+            <artifactId>spigot-api</artifactId>
             <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -141,6 +144,21 @@
                 <artifactId>githubreleases4j</artifactId>
                 <version>1.3.1</version>
             </dependency>
+            <dependency>
+                <groupId>cc.carm.lib</groupId>
+                <artifactId>easylistener</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>cc.carm.lib</groupId>
+                <artifactId>mineconfiguration-bukkit</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>cc.carm.lib</groupId>
+                <artifactId>easysql-beecp</artifactId>
+                <version>0.4.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>