feat(main): 添加完整的构造方法用于测试

.documentation/repository/REPO-README.md

@@ -0,0 +1,27 @@
+# EasyPlugin Repository
+
+采用github的repo分支进行依赖，随项目发布而自动更新。
+
+其他依赖方式见主页介绍。
+
+## 依赖方式
+
+### Maven
+
+```xml
+<repositories>
+    <repository>
+        <id>EasyPlugin</id>
+        <name>GitHub Branch Repository</name>
+        <url>https://github.com/CarmJos/EasyPlugin/blob/repo/</url>
+    </repository>
+</repositories>
+```
+
+### Gradle
+
+```groovy
+repositories {
+    maven { url 'https://github.com/CarmJos/EasyPlugin/blob/repo/' }
+}
+```

.github/ISSUE_TEMPLATE/bugs_report.md

@@ -14,6 +14,7 @@ assignees: ''
 ### **问题来源**
 
 描述一下通过哪些操作才发现的问题，如：
+
 1. 使用了 ...
 2. 输入了 ...
 3. 出现了报错 ...
@@ -32,7 +33,6 @@ assignees: ''
 - Java版本: `JDK11` / `OPENJDK8` / `JRE8` / `...`
 - 服务端版本: 请在后台输入 `version` 并复制相关输出。
 
-
 ### **其他补充**
 
 如有其他补充，可以在这里描述。

.github/ISSUE_TEMPLATE/feature_issues.md

@@ -8,13 +8,17 @@ assignees: ''
 ---
 
 ### **功能简述**
+
 简单的描述一下你想要的功能
 
 ### **需求来源**
+
 简单的描述一下为什么需要这个功能。
 
 ### **功能参考**(可选)
+
 如果有相关功能的参考，如文本、截图，请提供给我们。
 
 ### **附加内容**
+
 如果有什么小细节需要重点注意，请在这里告诉我们。

.github/workflows/deploy.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Project Deployment
+name: Deploy & Publish
 
 on:
   # 支持手动触发构建
@@ -11,10 +11,8 @@ on:
     types: [ published ]
 
 jobs:
-  maven-deploy:
+  packages-deploy:
-
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
       - name: "Set up JDK"
@@ -28,16 +26,14 @@ jobs:
           server-password: MAVEN_TOKEN
 
       - name: "Maven Deploy"
-        run: mvn -B deploy --file pom.xml -DskipTests
+        run: mvn -B -Pgithub deploy --file pom.xml -DskipTests
         env:
           MAVEN_USERNAME: ${{ github.repository_owner }}
           MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
 
-  javadoc-deploy:
+  github-deploy:
-
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
       - name: "Set up JDK"
@@ -47,6 +43,16 @@ jobs:
           distribution: 'adopt'
           cache: maven
 
+      - name: "Maven Deploy"
+        run: mvn -B -Plocal deploy --file pom.xml -DskipTests
+
+      - name: "Copy artifacts"
+        run: |
+          rm -rf deploy
+          mkdir -vp deploy
+          cp -vrf $HOME/local-deploy/* deploy/
+          cp -vrf .documentation/repository/REPO-README.md deploy/README.md
+
       - name: "Generate Javadoc"
         run: mvn -B javadoc:aggregate --file pom.xml -DskipTests
 
@@ -57,21 +63,21 @@ jobs:
           cp -vrf target/site/apidocs/* docs/
           cp -vrf .documentation/javadoc/JAVADOC-README.md docs/README.md
 
-      - name: "Generate Sitemap"
+      - name: "Generate Javadoc sitemap"
         id: sitemap
         uses: cicirello/generate-sitemap@v1
         with:
-          base-url-path: https://carmjos.github.io/EasyPlugin
+          base-url-path: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}
           path-to-root: docs
 
-      - name: Output stats
+      - name: "Output Javadoc stats"
         run: |
           echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
           echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
           echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
           ls -l docs
 
-      - name: Configure Git
+      - name: "Configure Git"
         env:
           DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
         run: |
@@ -80,19 +86,25 @@ jobs:
           echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan github.com >> ~/.ssh/known_hosts
-          git config --global user.name 'CarmJos'
+          git config --global user.name '${{ github.repository_owner }}'
-          git config --global user.email 'carm@carm.cc'
+          git config --global user.email '${{ github.repository_owner }}@users.noreply.github.com'
 
-      - name: Commit documentation changes
+      - name: "Commit&Push repository files"
+        run: |
+          cd deploy
+          git init
+          git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git
+          git checkout -b repo
+          git add -A
+          git commit -m "Maven project deployment."
+          git push origin HEAD:repo --force
+
+      - name: "Commit&Push API documentation"
         run: |
           cd docs
           git init
-          git remote add origin git@github.com:CarmJos/EasyPlugin.git
+          git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git
           git checkout -b gh-pages
           git add -A
           git commit -m "API Document generated."
-
-      - name: Javadoc Website Push
-        run: |
-          cd docs
           git push origin HEAD:gh-pages --force

.github/workflows/maven.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Project Build & Tests
+name: Build & Tests
 
 on:
   # 支持手动触发构建
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           cache: maven
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
           server-id: github
           server-username: MAVEN_USERNAME

README.md

@@ -67,10 +67,10 @@
     <repositories>
 
         <repository>
-            <!--采用github依赖库，安全稳定，但需要配置 (推荐)-->
+            <!--采用github-repo依赖库(推荐)-->
             <id>EasyPlugin</id>
             <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
+            <url>https://raw.githubusercontent.com/CarmJos/EasyPlugin/repo/</url>
         </repository>
 
         <repository>
@@ -121,7 +121,7 @@
 ```groovy
 repositories {
     // 采用github依赖库，安全稳定，但需要配置 (推荐)
-    maven { url 'https://maven.pkg.github.com/CarmJos/EasyPlugin' }
+    maven { url 'https://raw.githubusercontent.com/CarmJos/EasyPlugin/repo/' }
 
     // 采用我的私人依赖库，简单方便，但可能因为变故而无法使用
     maven { url 'https://repo.carm.cc/repository/maven-public/' }

base/command/pom.xml

@@ -5,16 +5,47 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>easyplugin-command</artifactId>
-
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.source>${project.jdk.version}</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <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-command</artifactId>
+    <packaging>jar</packaging>
+
+    <name>EasyPlugin-Command</name>
+    <description>轻松插件指令接口模块，方便快捷的编写子指令。</description>
+    <url>https://github.com/CarmJos/EasyPlugin</url>
+
+    <developers>
+        <developer>
+            <id>CarmJos</id>
+            <name>Carm Jos</name>
+            <email>carm@carm.cc</email>
+            <url>https://www.carm.cc</url>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>The MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
+        </license>
+    </licenses>
+
+    <issueManagement>
+        <system>GitHub Issues</system>
+        <url>https://github.com/CarmJos/EasyPlugin/issues</url>
+    </issueManagement>
+
+    <ciManagement>
+        <system>GitHub Actions</system>
+        <url>https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml</url>
+    </ciManagement>
 
 </project>

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

@@ -1,4 +1,3 @@
-
 package cc.carm.lib.easyplugin.command;
 
 import org.bukkit.command.Command;

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

@@ -1,8 +1,14 @@
 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;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
 
 public interface NamedExecutor {
 
@@ -14,4 +20,17 @@ public interface NamedExecutor {
         return true;
     }
 
+    default Void sendMessage(@NotNull CommandSender sender, @NotNull String... messages) {
+        return sendMessage(sender, (Function<String, String>) null, messages);
+    }
+
+    default Void sendMessage(@NotNull CommandSender sender,
+                             @Nullable Function<String, String> parser,
+                             @NotNull String... messages) {
+        if (messages == null || messages.length == 0) return null;
+        Function<String, String> finalParser = Optional.ofNullable(parser).orElse(Function.identity());
+        Arrays.stream(messages).map(finalParser).forEach(sender::sendMessage);
+        return null;
+    }
+
 }

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

@@ -13,6 +13,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SimpleCompleter {
 
@@ -21,9 +22,13 @@ public class SimpleCompleter {
     }
 
     public static @NotNull List<String> objects(@NotNull String input, int limit, List<?> objects) {
-        return objects.stream().filter(Objects::nonNull).map(Object::toString)
+        return objects(input, limit, objects.stream());
+    }
+
+    public static @NotNull List<String> objects(@NotNull String input, int limit, Stream<?> stream) {
+        return stream.filter(Objects::nonNull).map(Object::toString)
                 .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
-                .limit(Math.min(0, limit)).collect(Collectors.toList());
+                .limit(Math.max(0, limit)).collect(Collectors.toList());
     }
 
     public static @NotNull List<String> text(@NotNull String input, String... texts) {
@@ -47,7 +52,7 @@ public class SimpleCompleter {
     }
 
     public static @NotNull List<String> onlinePlayers(@NotNull String input, int limit) {
-        return text(input, limit, Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName).collect(Collectors.toList()));
+        return objects(input, limit, Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName));
     }
 
     public static @NotNull List<String> allPlayers(@NotNull String input) {
@@ -55,7 +60,7 @@ public class SimpleCompleter {
     }
 
     public static @NotNull List<String> allPlayers(@NotNull String input, int limit) {
-        return text(input, limit, Arrays.stream(Bukkit.getOfflinePlayers()).map(OfflinePlayer::getName).collect(Collectors.toList()));
+        return objects(input, limit, Arrays.stream(Bukkit.getOfflinePlayers()).map(OfflinePlayer::getName));
     }
 
     public static @NotNull List<String> worlds(@NotNull String input) {
@@ -63,7 +68,7 @@ public class SimpleCompleter {
     }
 
     public static @NotNull List<String> worlds(@NotNull String input, int limit) {
-        return text(input, limit, Bukkit.getWorlds().stream().map(World::getName).collect(Collectors.toList()));
+        return objects(input, limit, Bukkit.getWorlds().stream().map(World::getName));
     }
 
     public static @NotNull List<String> materials(@NotNull String input) {
@@ -71,7 +76,7 @@ public class SimpleCompleter {
     }
 
     public static @NotNull List<String> materials(@NotNull String input, int limit) {
-        return text(input, limit, Arrays.stream(Material.values()).map(Enum::name).collect(Collectors.toList()));
+        return objects(input, limit, Arrays.stream(Material.values()).map(Enum::name));
     }
 
     public static @NotNull List<String> effects(@NotNull String input) {
@@ -79,7 +84,7 @@ public class SimpleCompleter {
     }
 
     public static @NotNull List<String> effects(@NotNull String input, int limit) {
-        return text(input, limit, Arrays.stream(PotionEffectType.values()).map(PotionEffectType::getName).collect(Collectors.toList()));
+        return objects(input, limit, Arrays.stream(PotionEffectType.values()).map(PotionEffectType::getName));
     }
 
 }

base/gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -59,28 +59,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

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

@@ -21,191 +21,193 @@ import java.util.stream.IntStream;
 
 public class GUI {
 
-	private static JavaPlugin plugin;
+    private static JavaPlugin plugin;
-	private static final HashMap<UUID, GUI> openedGUIs = new HashMap<>();
+    private static final HashMap<UUID, GUI> openedGUIs = new HashMap<>();
 
-	public static void initialize(JavaPlugin plugin) {
+    public static void initialize(JavaPlugin plugin) {
-		GUI.plugin = plugin;
+        GUI.plugin = plugin;
-	}
+    }
 
-	public static JavaPlugin getPlugin() {
+    public static JavaPlugin getPlugin() {
-		return plugin;
+        return plugin;
-	}
+    }
 
-	public static HashMap<UUID, GUI> getOpenedGUIs() {
+    public static HashMap<UUID, GUI> getOpenedGUIs() {
-		return openedGUIs;
+        return openedGUIs;
-	}
+    }
 
-	protected GUIType type;
+    protected GUIType type;
-	protected String name;
+    protected String name;
-	public HashMap<Integer, GUIItem> items;
+    public HashMap<Integer, GUIItem> items;
-	public Inventory inv;
+    public Inventory inv;
 
-	/**
+    /**
-	 * 当玩家点击目标GUI时是否取消
+     * 当玩家点击目标GUI时是否取消
-	 */
+     */
-	boolean cancelOnTarget = true;
+    boolean cancelOnTarget = true;
 
-	/**
+    /**
-	 * 当玩家点击自己背包时是否取消
+     * 当玩家点击自己背包时是否取消
-	 */
+     */
-	boolean cancelOnSelf = true;
+    boolean cancelOnSelf = true;
 
-	/**
+    /**
-	 * 当玩家点击界面外时是否取消
+     * 当玩家点击界面外时是否取消
-	 */
+     */
-	boolean cancelOnOuter = true;
+    boolean cancelOnOuter = true;
 
-	Map<String, Object> flags;
+    Map<String, Object> flags;
 
-	GUIListener listener;
+    GUIListener listener;
 
-	public GUI(GUIType type, String name) {
+    public GUI(GUIType type, String name) {
-		this.type = type;
+        this.type = type;
-		this.name = ColorParser.parse(name);
+        this.name = ColorParser.parse(name);
-		this.items = new HashMap<>();
+        this.items = new HashMap<>();
-	}
+    }
 
 
-	public HashMap<@NotNull Integer, @NotNull GUIItem> getItems() {
+    public HashMap<@NotNull Integer, @NotNull GUIItem> getItems() {
-		return new HashMap<>(items);
+        return new HashMap<>(items);
-	}
+    }
 
-	public final void setItem(int index, @Nullable GUIItem item) {
+    public final void setItem(int index, @Nullable GUIItem item) {
-		if (item == null) {
+        if (item == null) {
-			this.items.remove(index);
+            this.items.remove(index);
-		} else {
+        } else {
-			this.items.put(index, item);
+            this.items.put(index, item);
-		}
+        }
-	}
+    }
 
-	public void setItem(GUIItem item, int... index) {
+    public void setItem(GUIItem item, int... index) {
-		for (int i : index) {
+        for (int i : index) {
-			setItem(i, item);
+            setItem(i, item);
-		}
+        }
-	}
+    }
 
-	public GUIItem getItem(int index) {
+    public GUIItem getItem(int index) {
-		return this.items.get(index);
+        return this.items.get(index);
-	}
+    }
 
-	/**
+    /**
-	 * 更新玩家箱子的视图
+     * 更新玩家箱子的视图
-	 */
+     */
-	public void updateView() {
+    public void updateView() {
-		if (this.inv != null) {
+        if (this.inv != null) {
-			List<HumanEntity> viewers = this.inv.getViewers();
+            List<HumanEntity> viewers = this.inv.getViewers();
-			IntStream.range(0, this.inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
+            IntStream.range(0, this.inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
-			getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
+            getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
-			viewers.forEach(p -> ((Player) p).updateInventory());
+            viewers.forEach(p -> ((Player) p).updateInventory());
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * 设置是否取消点击GUI内物品的事件
+     * 设置是否取消点击GUI内物品的事件
-	 * 如果不取消，玩家可以从GUI中拿取物品。
+     * 如果不取消，玩家可以从GUI中拿取物品。
-	 *
+     *
-	 * @param b 是否取消
+     * @param b 是否取消
-	 */
+     */
-	public void setCancelOnTarget(boolean b) {
+    public void setCancelOnTarget(boolean b) {
-		this.cancelOnTarget = b;
+        this.cancelOnTarget = b;
-	}
+    }
 
-	/**
+    /**
-	 * 设置是否取消点击自己背包内物品的事件
+     * 设置是否取消点击自己背包内物品的事件
-	 * 如果不取消，玩家可以从自己的背包中拿取物品。
+     * 如果不取消，玩家可以从自己的背包中拿取物品。
-	 *
+     *
-	 * @param b 是否取消
+     * @param b 是否取消
-	 */
+     */
-	public void setCancelOnSelf(boolean b) {
+    public void setCancelOnSelf(boolean b) {
-		this.cancelOnSelf = b;
+        this.cancelOnSelf = b;
-	}
+    }
 
-	/**
+    /**
-	 * 设置是否取消点击GUI外的事件
+     * 设置是否取消点击GUI外的事件
-	 * 如果不取消，玩家可以把物品从GUI或背包中丢出去
+     * 如果不取消，玩家可以把物品从GUI或背包中丢出去
-	 *
+     *
-	 * @param b 是否取消
+     * @param b 是否取消
-	 */
+     */
-	public void setCancelOnOuter(boolean b) {
+    public void setCancelOnOuter(boolean b) {
-		this.cancelOnOuter = b;
+        this.cancelOnOuter = b;
-	}
+    }
 
-	public void addFlag(String flag, Object obj) {
+    public void addFlag(String flag, Object obj) {
-		if (this.flags == null) this.flags = new HashMap<>();
+        if (this.flags == null) this.flags = new HashMap<>();
-		this.flags.put(flag, obj);
+        this.flags.put(flag, obj);
-	}
+    }
 
-	public Object getFlag(String flag) {
+    public Object getFlag(String flag) {
-		if (this.flags == null) return null;
+        if (this.flags == null) return null;
-		else
+        else
-			return this.flags.get(flag);
+            return this.flags.get(flag);
-	}
+    }
 
-	public void setFlag(String flag, Object obj) {
+    public void setFlag(String flag, Object obj) {
-		if (this.flags == null) this.flags = new HashMap<>();
+        if (this.flags == null) this.flags = new HashMap<>();
-		this.flags.replace(flag, obj);
+        this.flags.replace(flag, obj);
-	}
+    }
 
-	public void removeFlag(String flag) {
+    public void removeFlag(String flag) {
-		if (this.flags == null) this.flags = new HashMap<>();
+        if (this.flags == null) this.flags = new HashMap<>();
-		this.flags.remove(flag);
+        this.flags.remove(flag);
-	}
+    }
 
-	public void rawClickListener(InventoryClickEvent event) {
+    public void rawClickListener(InventoryClickEvent event) {
-	}
+    }
 
-	public void openGUI(Player player) {
+    public void openGUI(Player player) {
-		if (this.type == GUIType.CANCEL) { throw new IllegalStateException("被取消或不存在的GUI"); }
+        if (this.type == GUIType.CANCEL) {
+            throw new IllegalStateException("被取消或不存在的GUI");
+        }
 
-		Inventory inv = Bukkit.createInventory(null, this.type.getSize(), this.name);
+        Inventory inv = Bukkit.createInventory(null, this.type.getSize(), this.name);
-		IntStream.range(0, inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
+        IntStream.range(0, inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
-		getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
+        getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
 
-		GUI previous = getOpenedGUI(player);
+        GUI previous = getOpenedGUI(player);
-		if(previous != null){
+        if (previous != null) {
-			previous.listener.close(player);
+            previous.listener.close(player);
-		}
+        }
 
-		setOpenedGUI(player, this);
+        setOpenedGUI(player, this);
 
-		this.inv = inv;
+        this.inv = inv;
-		player.openInventory(inv);
+        player.openInventory(inv);
 
-		if (listener == null) {
+        if (listener == null) {
-			Bukkit.getPluginManager().registerEvents(listener = new GUIListener(this), getPlugin());
+            Bukkit.getPluginManager().registerEvents(listener = new GUIListener(this), getPlugin());
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * 拖动GUI内物品是执行的代码
+     * 拖动GUI内物品是执行的代码
-	 *
+     *
-	 * @param event InventoryDragEvent
+     * @param event InventoryDragEvent
-	 */
+     */
-	public void onDrag(InventoryDragEvent event) {
+    public void onDrag(InventoryDragEvent event) {
-	}
+    }
 
-	/**
+    /**
-	 * 关闭GUI时执行的代码
+     * 关闭GUI时执行的代码
-	 */
+     */
-	public void onClose() {
+    public void onClose() {
-	}
+    }
 
 
-	public static void setOpenedGUI(Player player, GUI gui) {
+    public static void setOpenedGUI(Player player, GUI gui) {
-		getOpenedGUIs().put(player.getUniqueId(), gui);
+        getOpenedGUIs().put(player.getUniqueId(), gui);
-	}
+    }
 
-	public static boolean hasOpenedGUI(Player player) {
+    public static boolean hasOpenedGUI(Player player) {
-		return getOpenedGUIs().containsKey(player.getUniqueId());
+        return getOpenedGUIs().containsKey(player.getUniqueId());
-	}
+    }
 
-	public static GUI getOpenedGUI(Player player) {
+    public static GUI getOpenedGUI(Player player) {
-		return getOpenedGUIs().get(player.getUniqueId());
+        return getOpenedGUIs().get(player.getUniqueId());
-	}
+    }
 
-	public static void removeOpenedGUI(Player player) {
+    public static void removeOpenedGUI(Player player) {
-		getOpenedGUIs().remove(player.getUniqueId());
+        getOpenedGUIs().remove(player.getUniqueId());
-	}
+    }
 
 }

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

@@ -10,64 +10,64 @@ import java.util.Set;
 
 public class GUIItem {
 
-	ItemStack display;
+    ItemStack display;
-	boolean actionActive = true;
+    boolean actionActive = true;
 
-	public Set<GUIClickAction> actions = new HashSet<>();
+    public Set<GUIClickAction> actions = new HashSet<>();
-	public Set<GUIClickAction> actionsIgnoreActive = new HashSet<>();
+    public Set<GUIClickAction> actionsIgnoreActive = new HashSet<>();
 
-	public GUIItem(ItemStack display) {
+    public GUIItem(ItemStack display) {
-		this.display = display;
+        this.display = display;
-	}
+    }
 
-	public final ItemStack getDisplay() {
+    public final ItemStack getDisplay() {
-		return this.display;
+        return this.display;
-	}
+    }
 
-	public final void setDisplay(ItemStack display) {
+    public final void setDisplay(ItemStack display) {
-		this.display = display;
+        this.display = display;
-	}
+    }
 
-	public final boolean isActionActive() {
+    public final boolean isActionActive() {
-		return this.actionActive;
+        return this.actionActive;
-	}
+    }
 
-	public final void setActionActive(boolean b) {
+    public final void setActionActive(boolean b) {
-		actionActive = b;
+        actionActive = b;
-	}
+    }
 
-	/**
+    /**
-	 * 玩家点击GUI后执行的代码
+     * 玩家点击GUI后执行的代码
-	 *
+     *
-	 * @param type 点击的类型
+     * @param type 点击的类型
-	 */
+     */
-	public void onClick(ClickType type) {
+    public void onClick(ClickType type) {
 
-	}
+    }
 
-	public void addClickAction(GUIClickAction action) {
+    public void addClickAction(GUIClickAction action) {
-		actions.add(action);
+        actions.add(action);
-	}
+    }
 
-	public void addActionIgnoreActive(GUIClickAction action) {
+    public void addActionIgnoreActive(GUIClickAction action) {
-		actionsIgnoreActive.add(action);
+        actionsIgnoreActive.add(action);
-	}
+    }
 
-	public void rawClickAction(InventoryClickEvent event) {
+    public void rawClickAction(InventoryClickEvent event) {
 
-	}
+    }
 
-	/**
+    /**
-	 * 玩家点击GUI后执行的代码
+     * 玩家点击GUI后执行的代码
-	 *
+     *
-	 * @param player 点击GUI的玩家
+     * @param player 点击GUI的玩家
-	 */
+     */
-	public void customAction(Player player) {
+    public void customAction(Player player) {
 
-	}
+    }
 
-	public abstract static class GUIClickAction {
+    public abstract static class GUIClickAction {
-		public abstract void run(ClickType type, Player player);
+        public abstract void run(ClickType type, Player player);
-	}
+    }
 
 }

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

@@ -11,82 +11,82 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 public class GUIListener implements Listener {
 
-	GUI currentGUI;
+    GUI currentGUI;
 
-	public GUIListener(GUI gui) {
+    public GUIListener(GUI gui) {
-		this.currentGUI = gui;
+        this.currentGUI = gui;
-	}
+    }
 
-	public GUI getCurrentGUI() {
+    public GUI getCurrentGUI() {
-		return currentGUI;
+        return currentGUI;
-	}
+    }
 
-	@EventHandler
+    @EventHandler
-	public void onInventoryClickEvent(InventoryClickEvent event) {
+    public void onInventoryClickEvent(InventoryClickEvent event) {
-		if (!(event.getWhoClicked() instanceof Player)) return;
+        if (!(event.getWhoClicked() instanceof Player)) return;
-		Player player = (Player) event.getWhoClicked();
+        Player player = (Player) event.getWhoClicked();
-		if (!GUI.hasOpenedGUI(player)) return;
+        if (!GUI.hasOpenedGUI(player)) return;
-		if (GUI.getOpenedGUI(player) != getCurrentGUI()) return;
+        if (GUI.getOpenedGUI(player) != getCurrentGUI()) return;
 
-		getCurrentGUI().rawClickListener(event);
+        getCurrentGUI().rawClickListener(event);
 
-		if (event.getSlot() == -999 && getCurrentGUI().cancelOnOuter) {
+        if (event.getSlot() == -999 && getCurrentGUI().cancelOnOuter) {
-			event.setCancelled(true);
+            event.setCancelled(true);
-			return;
+            return;
-		}
+        }
 
-		if (event.getClickedInventory() == null) return;
+        if (event.getClickedInventory() == null) return;
 
-		if (event.getClickedInventory().equals(getCurrentGUI().inv)) {
+        if (event.getClickedInventory().equals(getCurrentGUI().inv)) {
 
-			if (getCurrentGUI().cancelOnTarget) event.setCancelled(true);
+            if (getCurrentGUI().cancelOnTarget) event.setCancelled(true);
 
-			if (event.getSlot() != -999) {
+            if (event.getSlot() != -999) {
-				GUIItem clickedItem = getCurrentGUI().getItem(event.getSlot());
+                GUIItem clickedItem = getCurrentGUI().getItem(event.getSlot());
-				if (clickedItem != null) {
+                if (clickedItem != null) {
-					if (clickedItem.isActionActive()) {
+                    if (clickedItem.isActionActive()) {
-						clickedItem.onClick(event.getClick());
+                        clickedItem.onClick(event.getClick());
-						clickedItem.rawClickAction(event);
+                        clickedItem.rawClickAction(event);
-						clickedItem.actions.forEach(action -> action.run(event.getClick(), player));
+                        clickedItem.actions.forEach(action -> action.run(event.getClick(), player));
-					}
+                    }
-					clickedItem.actionsIgnoreActive.forEach(action -> action.run(event.getClick(), player));
+                    clickedItem.actionsIgnoreActive.forEach(action -> action.run(event.getClick(), player));
-				}
+                }
-			}
+            }
 
-		} else if (event.getClickedInventory().equals(player.getInventory()) && getCurrentGUI().cancelOnSelf) {
+        } else if (event.getClickedInventory().equals(player.getInventory()) && getCurrentGUI().cancelOnSelf) {
-			event.setCancelled(true);
+            event.setCancelled(true);
-		}
+        }
 
-	}
+    }
 
-	@EventHandler
+    @EventHandler
-	public void onDrag(InventoryDragEvent e) {
+    public void onDrag(InventoryDragEvent e) {
-		if (!(e.getWhoClicked() instanceof Player)) return;
+        if (!(e.getWhoClicked() instanceof Player)) return;
-		if (e.getInventory().equals(getCurrentGUI().inv)
+        if (e.getInventory().equals(getCurrentGUI().inv)
-				|| e.getInventory().equals(e.getWhoClicked().getInventory())) {
+                || e.getInventory().equals(e.getWhoClicked().getInventory())) {
-			getCurrentGUI().onDrag(e);
+            getCurrentGUI().onDrag(e);
-		}
+        }
-	}
+    }
 
-	@EventHandler
+    @EventHandler
-	public void onInventoryCloseEvent(InventoryCloseEvent event) {
+    public void onInventoryCloseEvent(InventoryCloseEvent event) {
-		if (!(event.getPlayer() instanceof Player)) return;
+        if (!(event.getPlayer() instanceof Player)) return;
-		if (!event.getInventory().equals(getCurrentGUI().inv)) return;
+        if (!event.getInventory().equals(getCurrentGUI().inv)) return;
 
-		close((Player) event.getPlayer());
+        close((Player) event.getPlayer());
 
-	}
+    }
 
-	protected void close(Player p){
+    protected void close(Player p) {
-		HandlerList.unregisterAll(this);
+        HandlerList.unregisterAll(this);
-		getCurrentGUI().listener = null;
+        getCurrentGUI().listener = null;
-		GUI.removeOpenedGUI(p);
+        GUI.removeOpenedGUI(p);
-		getCurrentGUI().onClose();
+        getCurrentGUI().onClose();
-	}
+    }
 
-	@EventHandler
+    @EventHandler
-	public void onPlayerLeave(PlayerQuitEvent event) {
+    public void onPlayerLeave(PlayerQuitEvent event) {
-		GUI.removeOpenedGUI(event.getPlayer());
+        GUI.removeOpenedGUI(event.getPlayer());
-	}
+    }
 
 }

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

@@ -6,44 +6,44 @@ import java.util.Arrays;
 
 public enum GUIType {
 
-	ONE_BY_NINE(1, 9),
+    ONE_BY_NINE(1, 9),
-	TWO_BY_NINE(2, 18),
+    TWO_BY_NINE(2, 18),
-	THREE_BY_NINE(3, 27),
+    THREE_BY_NINE(3, 27),
-	FOUR_BY_NINE(4, 36),
+    FOUR_BY_NINE(4, 36),
-	FIVE_BY_NINE(5, 45),
+    FIVE_BY_NINE(5, 45),
-	SIX_BY_NINE(6, 54),
+    SIX_BY_NINE(6, 54),
-	CANCEL(0, 0);
+    CANCEL(0, 0);
 
-	int lines;
+    int lines;
-	int size;
+    int size;
 
-	GUIType(int lines, int size) {
+    GUIType(int lines, int size) {
-		this.lines = lines;
+        this.lines = lines;
-		this.size = size;
+        this.size = size;
-	}
+    }
 
-	public int getLines() {
+    public int getLines() {
-		return lines;
+        return lines;
-	}
+    }
 
-	public int getSize() {
+    public int getSize() {
-		return size;
+        return size;
-	}
+    }
 
-	@NotNull
+    @NotNull
-	public static GUIType getBySize(int size) {
+    public static GUIType getBySize(int size) {
-		return Arrays.stream(values()).filter(type -> type.getSize() == size).findFirst().orElse(CANCEL);
+        return Arrays.stream(values()).filter(type -> type.getSize() == size).findFirst().orElse(CANCEL);
-	}
+    }
 
-	@NotNull
+    @NotNull
-	public static GUIType getByLines(int lines) {
+    public static GUIType getByLines(int lines) {
-		return Arrays.stream(values()).filter(type -> type.getLines() == lines).findFirst().orElse(CANCEL);
+        return Arrays.stream(values()).filter(type -> type.getLines() == lines).findFirst().orElse(CANCEL);
-	}
+    }
 
 
-	@NotNull
+    @NotNull
-	public static GUIType getByName(String name) {
+    public static GUIType getByName(String name) {
-		return Arrays.stream(values()).filter(type -> type.name().equalsIgnoreCase(name)).findFirst().orElse(CANCEL);
+        return Arrays.stream(values()).filter(type -> type.name().equalsIgnoreCase(name)).findFirst().orElse(CANCEL);
-	}
+    }
 
 }

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

@@ -3,51 +3,104 @@ package cc.carm.lib.easyplugin.gui.configuration;
 import cc.carm.lib.easyplugin.gui.GUIItem;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class GUIActionConfiguration {
 
+    public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType,
+                                                     @Nullable ClickType clickType,
+                                                     @Nullable String actionContent) {
+        return new GUIActionConfiguration(actionType, clickType, actionContent);
+    }
 
-	@Nullable ClickType clickType;
+    public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType,
-	final @NotNull GUIActionType actionType;
+                                                     @Nullable String actionContent) {
-	final @Nullable String actionContent;
+        return of(actionType, null, actionContent);
+    }
 
-	public GUIActionConfiguration(@Nullable ClickType clickType,
+    public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType,
-								  @NotNull GUIActionType actionType,
+                                                     @Nullable ClickType clickType) {
-								  @Nullable String actionContent) {
+        return of(actionType, clickType, null);
-		this.clickType = clickType;
+    }
-		this.actionType = actionType;
-		this.actionContent = actionContent;
-	}
 
-	public @Nullable ClickType getClickType() {
+    public static @NotNull GUIActionConfiguration of(@NotNull GUIActionType actionType) {
-		return clickType;
+        return of(actionType, null, null);
-	}
+    }
 
-	public @NotNull GUIActionType getActionType() {
+    protected final @NotNull GUIActionType actionType;
-		return actionType;
-	}
 
-	public @Nullable String getActionContent() {
+    protected final @Nullable ClickType clickType;
-		return actionContent;
+    protected final @Nullable String actionContent;
-	}
 
-	public void checkAction(Player player, ClickType type) {
+    public GUIActionConfiguration(@NotNull GUIActionType actionType,
-		if (getClickType() == null || getClickType() == type) executeAction(player);
+                                  @Nullable ClickType clickType,
-	}
+                                  @Nullable String actionContent) {
+        this.clickType = clickType;
+        this.actionType = actionType;
+        this.actionContent = actionContent;
+    }
 
-	public void executeAction(Player targetPlayer) {
+    public @Nullable ClickType getClickType() {
-		getActionType().getExecutor().accept(targetPlayer, getActionContent());
+        return clickType;
-	}
+    }
 
-	public GUIItem.GUIClickAction toClickAction() {
+    public @NotNull GUIActionType getActionType() {
-		return new GUIItem.GUIClickAction() {
+        return actionType;
-			@Override
+    }
-			public void run(ClickType type, Player player) {
+
-				checkAction(player, type);
+    public @Nullable String getActionContent() {
-			}
+        return actionContent;
-		};
+    }
-	}
+
+    public void checkAction(Player player, ClickType type) {
+        if (getClickType() == null || getClickType() == type) executeAction(player);
+    }
+
+    public void executeAction(Player targetPlayer) {
+        getActionType().getExecutor().accept(targetPlayer, getActionContent());
+    }
+
+    public GUIItem.GUIClickAction toClickAction() {
+        return new GUIItem.GUIClickAction() {
+            @Override
+            public void run(ClickType type, Player player) {
+                checkAction(player, type);
+            }
+        };
+    }
+
+    @Nullable
+    @Contract("null->null")
+    public static GUIActionConfiguration deserialize(@Nullable String actionString) {
+        if (actionString == null) return null;
+
+        int prefixStart = actionString.indexOf("[");
+        int prefixEnd = actionString.indexOf("]");
+        if (prefixStart < 0 || prefixEnd < 0) return null;
+
+        String prefix = actionString.substring(prefixStart + 1, prefixEnd);
+        ClickType clickType = null;
+        GUIActionType actionType;
+        if (prefix.contains(":")) {
+            String[] args = prefix.split(":");
+            clickType = GUIConfiguration.readClickType(args[0]);
+            actionType = GUIActionType.readActionType(args[1]);
+        } else {
+            actionType = GUIActionType.readActionType(prefix);
+        }
+
+        if (actionType == null) return null;
+
+        String content = actionString.substring(prefixEnd + 1).trim();
+        return of(actionType, clickType, content);
+    }
+
+    public @NotNull String serialize() {
+        String prefix = "[" + getActionType().name() + (getClickType() == null ? "" : ":" + getClickType().name()) + "]";
+        String content = getActionContent() == null ? "" : " " + getActionContent();
+        return prefix + content;
+    }
 
 }

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

@@ -13,76 +13,76 @@ import java.util.function.BiConsumer;
 
 public enum GUIActionType {
 
-	/**
+    /**
-	 * 以玩家聊天的形式执行
+     * 以玩家聊天的形式执行
-	 * 若内容以 “/" 开头，则会以玩家身份执行命令。
+     * 若内容以 “/" 开头，则会以玩家身份执行命令。
-	 */
+     */
-	CHAT((player, string) -> {
+    CHAT((player, string) -> {
-		if (string == null) return;
+        if (string == null) return;
-		MessageUtils.setPlaceholders(player, Collections.singletonList(string)).forEach(player::chat);
+        MessageUtils.setPlaceholders(player, Collections.singletonList(string)).forEach(player::chat);
-	}),
+    }),
 
-	/**
+    /**
-	 * 以后台的形式执行指令
+     * 以后台的形式执行指令
-	 * 指令内容不需要以“/”开头。
+     * 指令内容不需要以“/”开头。
-	 */
+     */
-	CONSOLE((player, string) -> {
+    CONSOLE((player, string) -> {
-		if (string == null) return;
+        if (string == null) return;
-		MessageUtils.setPlaceholders(player, Collections.singletonList(string))
+        MessageUtils.setPlaceholders(player, Collections.singletonList(string))
-				.forEach(message -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), message));
+                .forEach(message -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), message));
-	}),
+    }),
 
-	/**
+    /**
-	 * 向玩家发送消息。
+     * 向玩家发送消息。
-	 */
+     */
-	MESSAGE(MessageUtils::send),
+    MESSAGE(MessageUtils::send),
 
-	/**
+    /**
-	 * 向玩家发送声音。
+     * 向玩家发送声音。
-	 * 允许配置音量与音调
+     * 允许配置音量与音调
-	 * <ul>
+     * <ul>
-	 *   <li>SOUND_NAME</li>
+     *   <li>SOUND_NAME</li>
-	 *   <li>SOUND_NAME:VOLUME</li>
+     *   <li>SOUND_NAME:VOLUME</li>
-	 *   <li>SOUND_NAME:VOLUME:PITCH</li>
+     *   <li>SOUND_NAME:VOLUME:PITCH</li>
-	 * </ul>
+     * </ul>
-	 */
+     */
-	SOUND((player, string) -> {
+    SOUND((player, string) -> {
-		if (string == null) return;
+        if (string == null) return;
-		try {
+        try {
-			String[] args = string.contains(":") ? string.split(":") : new String[]{string};
+            String[] args = string.contains(":") ? string.split(":") : new String[]{string};
-			Sound sound = Arrays.stream(Sound.values())
+            Sound sound = Arrays.stream(Sound.values())
-					.filter(s -> s.name().equals(args[0]))
+                    .filter(s -> s.name().equals(args[0]))
-					.findFirst().orElse(null);
+                    .findFirst().orElse(null);
 
-			if (sound == null) return;
+            if (sound == null) return;
-			float volume = args.length > 1 ? Float.parseFloat(args[1]) : 1F;
+            float volume = args.length > 1 ? Float.parseFloat(args[1]) : 1F;
-			float pitch = args.length > 2 ? Float.parseFloat(args[2]) : 1F;
+            float pitch = args.length > 2 ? Float.parseFloat(args[2]) : 1F;
 
-			player.playSound(player.getLocation(), sound, volume, pitch);
+            player.playSound(player.getLocation(), sound, volume, pitch);
-		} catch (Exception ignored) {
+        } catch (Exception ignored) {
-		}
+        }
-	}),
+    }),
 
-	/**
+    /**
-	 * 为玩家关闭GUI。
+     * 为玩家关闭GUI。
-	 */
+     */
-	CLOSE((player, string) -> player.closeInventory());
+    CLOSE((player, string) -> player.closeInventory());
 
-	BiConsumer<@NotNull Player, @Nullable String> executor;
+    BiConsumer<@NotNull Player, @Nullable String> executor;
 
 
-	GUIActionType(BiConsumer<@NotNull Player, @Nullable String> executor) {
+    GUIActionType(BiConsumer<@NotNull Player, @Nullable String> executor) {
-		this.executor = executor;
+        this.executor = executor;
-	}
+    }
 
-	public BiConsumer<@NotNull Player, @Nullable String> getExecutor() {
+    public BiConsumer<@NotNull Player, @Nullable String> getExecutor() {
-		return executor;
+        return executor;
-	}
+    }
 
-	public static GUIActionType readActionType(String string) {
+    public static GUIActionType readActionType(String string) {
-		return Arrays.stream(GUIActionType.values())
+        return Arrays.stream(GUIActionType.values())
-				.filter(action -> action.name().equalsIgnoreCase(string))
+                .filter(action -> action.name().equalsIgnoreCase(string))
-				.findFirst().orElse(null);
+                .findFirst().orElse(null);
-	}
+    }
 
 }

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

@@ -13,60 +13,60 @@ import java.util.stream.Collectors;
 
 public class GUIConfiguration {
 
-	String title;
+    String title;
-	int lines;
+    int lines;
 
-	List<GUIItemConfiguration> guiItems;
+    List<GUIItemConfiguration> guiItems;
 
-	public GUIConfiguration(String title, int lines, List<GUIItemConfiguration> guiItems) {
+    public GUIConfiguration(String title, int lines, List<GUIItemConfiguration> guiItems) {
-		this.title = title;
+        this.title = title;
-		this.lines = lines;
+        this.lines = lines;
-		this.guiItems = guiItems;
+        this.guiItems = guiItems;
-	}
+    }
 
-	public String getTitle() {
+    public String getTitle() {
-		return ColorParser.parse(title);
+        return ColorParser.parse(title);
-	}
+    }
 
-	public int getLines() {
+    public int getLines() {
-		return lines;
+        return lines;
-	}
+    }
 
-	public GUIType getGUIType() {
+    public GUIType getGUIType() {
-		return Optional.of(GUIType.getByLines(lines))
+        return Optional.of(GUIType.getByLines(lines))
-				.map(type -> type == GUIType.CANCEL ? GUIType.SIX_BY_NINE : type)
+                .map(type -> type == GUIType.CANCEL ? GUIType.SIX_BY_NINE : type)
-				.get();
+                .get();
-	}
+    }
 
-	public List<GUIItemConfiguration> getGuiItems() {
+    public List<GUIItemConfiguration> getGuiItems() {
-		return guiItems;
+        return guiItems;
-	}
+    }
 
-	public void setupItems(Player player, GUI gui) {
+    public void setupItems(Player player, GUI gui) {
-		getGuiItems().forEach(itemConfiguration -> itemConfiguration.setupItems(player, gui));
+        getGuiItems().forEach(itemConfiguration -> itemConfiguration.setupItems(player, gui));
-	}
+    }
 
 
-	public static GUIConfiguration readConfiguration(@Nullable ConfigurationSection section) {
+    public static GUIConfiguration readConfiguration(@Nullable ConfigurationSection section) {
-		if (section == null) return new GUIConfiguration("name", 6, new ArrayList<>());
+        if (section == null) return new GUIConfiguration("name", 6, new ArrayList<>());
 
-		String title = section.getString("title", "");
+        String title = section.getString("title", "");
-		int lines = section.getInt("lines", 6);
+        int lines = section.getInt("lines", 6);
-		ConfigurationSection itemsSection = section.getConfigurationSection("items");
+        ConfigurationSection itemsSection = section.getConfigurationSection("items");
-		if (itemsSection == null) return new GUIConfiguration(title, lines, new ArrayList<>());
+        if (itemsSection == null) return new GUIConfiguration(title, lines, new ArrayList<>());
 
-		return new GUIConfiguration(
+        return new GUIConfiguration(
-				title, lines, itemsSection.getKeys(false).stream()
+                title, lines, itemsSection.getKeys(false).stream()
-				.map(key -> GUIItemConfiguration.readFrom(itemsSection.getConfigurationSection(key)))
+                .map(key -> GUIItemConfiguration.readFrom(itemsSection.getConfigurationSection(key)))
-				.filter(Objects::nonNull)
+                .filter(Objects::nonNull)
-				.collect(Collectors.toList())
+                .collect(Collectors.toList())
-		);
+        );
-	}
+    }
 
-	public static ClickType readClickType(String type) {
+    public static ClickType readClickType(String type) {
-		return Arrays.stream(ClickType.values())
+        return Arrays.stream(ClickType.values())
-				.filter(click -> click.name().equalsIgnoreCase(type))
+                .filter(click -> click.name().equalsIgnoreCase(type))
-				.findFirst().orElse(null);
+                .findFirst().orElse(null);
-	}
+    }
 
 }

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

@@ -7,86 +7,88 @@ import cc.carm.lib.easyplugin.utils.MessageUtils;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
+import java.util.stream.Collectors;
-import java.util.List;
-import java.util.Optional;
 
 public class GUIItemConfiguration {
 
-	Material material;
+    @NotNull Material type;
-	int data;
+    int data;
-	String name;
+    @Nullable String name;
-	@NotNull List<String> lore;
+    @NotNull List<String> lore;
 
-	@NotNull List<Integer> slots;
+    @NotNull List<Integer> slots;
-	@NotNull List<GUIActionConfiguration> actions;
+    @NotNull List<GUIActionConfiguration> actions;
 
-	public GUIItemConfiguration(Material material, int data,
+    public GUIItemConfiguration(@NotNull Material type, int data,
-								String name, @NotNull List<String> lore,
+                                @Nullable String name, @NotNull List<String> lore,
-								@NotNull List<GUIActionConfiguration> actions,
+                                @NotNull List<GUIActionConfiguration> actions,
-								@NotNull List<Integer> slots) {
+                                @NotNull List<Integer> slots) {
-		this.material = material;
+        this.type = type;
-		this.data = data;
+        this.data = data;
-		this.name = name;
+        this.name = name;
-		this.lore = lore;
+        this.lore = lore;
-		this.slots = slots;
+        this.slots = slots;
-		this.actions = actions;
+        this.actions = actions;
-	}
+    }
 
-	public void setupItems(Player player, GUI gui) {
+    public void setupItems(Player player, GUI gui) {
-		ItemStackFactory icon = new ItemStackFactory(this.material);
+        ItemStackFactory icon = new ItemStackFactory(this.type);
-		icon.setDurability(this.data);
+        icon.setDurability(this.data);
-		if (this.name != null) icon.setDisplayName(this.name);
+        if (this.name != null) icon.setDisplayName(this.name);
-		icon.setLore(MessageUtils.setPlaceholders(player, this.lore));
+        icon.setLore(MessageUtils.setPlaceholders(player, this.lore));
 
-		GUIItem item = new GUIItem(icon.toItemStack());
+        GUIItem item = new GUIItem(icon.toItemStack());
-		this.actions.stream().map(GUIActionConfiguration::toClickAction).forEach(item::addClickAction);
+        this.actions.stream().map(GUIActionConfiguration::toClickAction).forEach(item::addClickAction);
-		this.slots.forEach(slot -> gui.setItem(slot, item));
+        this.slots.forEach(slot -> gui.setItem(slot, item));
-	}
+    }
 
-	@Nullable
+    public @NotNull Map<String, Object> serialize() {
-	public static GUIItemConfiguration readFrom(@Nullable ConfigurationSection itemSection) {
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-		if (itemSection == null) return null;
-		Material material = Optional.ofNullable(Material.matchMaterial(itemSection.getString("material", "STONE"))).orElse(Material.STONE);
-		int data = itemSection.getInt("data", 0);
-		String name = itemSection.getString("name");
-		List<String> lore = itemSection.getStringList("lore");
 
-		List<Integer> slots = itemSection.getIntegerList("slots");
+        map.put("type", this.type.name());
-		int slot = itemSection.getInt("slot", 0);
+        if (this.name != null) map.put("name", this.name);
+        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);
+        } else if (slots.size() == 1) {
+            map.put("slots", this.slots.get(0));
+        }
+        if (!this.actions.isEmpty()) {
+            map.put("actions", this.actions.stream().map(GUIActionConfiguration::serialize).collect(Collectors.toList()));
+        }
+        return map;
+    }
 
-		List<String> actionsString = itemSection.getStringList("actions");
+    @Nullable
-		List<GUIActionConfiguration> actions = new ArrayList<>();
+    public static GUIItemConfiguration readFrom(@Nullable ConfigurationSection itemSection) {
-		for (String actionString : actionsString) {
+        if (itemSection == null) return null;
-			int prefixStart = actionString.indexOf("[");
+        String material = Optional.ofNullable(itemSection.getString("type")).orElse("STONE");
-			int prefixEnd = actionString.indexOf("]");
+        Material type = Optional.ofNullable(Material.matchMaterial(material)).orElse(Material.STONE);
-			if (prefixStart < 0 || prefixEnd < 0) continue;
+        int data = itemSection.getInt("data", 0);
+        String name = itemSection.getString("name");
+        List<String> lore = itemSection.getStringList("lore");
 
-			String prefix = actionString.substring(prefixStart + 1, prefixEnd);
+        List<Integer> slots = itemSection.getIntegerList("slots");
-			ClickType clickType = null;
+        int slot = itemSection.getInt("slot", 0);
-			GUIActionType actionType;
-			if (prefix.contains(":")) {
-				String[] args = prefix.split(":");
-				clickType = GUIConfiguration.readClickType(args[0]);
-				actionType = GUIActionType.readActionType(args[1]);
-			} else {
-				actionType = GUIActionType.readActionType(prefix);
-			}
 
-			if (actionType == null) continue;
+        List<String> actionsString = itemSection.getStringList("actions");
-			actions.add(new GUIActionConfiguration(clickType, actionType, actionString.substring(prefixEnd + 1).trim()));
+        List<GUIActionConfiguration> actions = new ArrayList<>();
-		}
+        for (String actionString : actionsString) {
+            GUIActionConfiguration action = GUIActionConfiguration.deserialize(actionString);
+            if (action == null) continue;
+            actions.add(action);
+        }
 
-		return new GUIItemConfiguration(
+        return new GUIItemConfiguration(
-				material, data, name, lore, actions,
+                type, data, name, lore, actions,
-				slots.size() > 0 ? slots : Collections.singletonList(slot)
+                slots.size() > 0 ? slots : Collections.singletonList(slot)
-		);
+        );
-	}
+    }
 
 
 }

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

@@ -10,87 +10,87 @@ import java.util.function.Function;
 
 public class AutoPagedGUI extends CommonPagedGUI {
 
-	public static Function<Player, ItemStack> defaultPreviousPage = null;
+    public static Function<Player, ItemStack> defaultPreviousPage = null;
-	public static Function<Player, ItemStack> defaultNextPage = null;
+    public static Function<Player, ItemStack> defaultNextPage = null;
 
-	ItemStack previousPageUI;
+    ItemStack previousPageUI;
-	ItemStack nextPageUI;
+    ItemStack nextPageUI;
-	int previousPageSlot = -1;
+    int previousPageSlot = -1;
-	int nextPageSlot = -1;
+    int nextPageSlot = -1;
 
-	public AutoPagedGUI(GUIType type, String name, int[] range) {
+    public AutoPagedGUI(GUIType type, String name, int[] range) {
-		super(type, name, range);
+        super(type, name, range);
-	}
+    }
 
-	public AutoPagedGUI(GUIType type, String name, int a, int b) {
+    public AutoPagedGUI(GUIType type, String name, int a, int b) {
-		super(type, name, a, b);
+        super(type, name, a, b);
-	}
+    }
 
-	public void setPreviousPageUI(ItemStack lastPageUI) {
+    public void setPreviousPageUI(ItemStack lastPageUI) {
-		this.previousPageUI = lastPageUI;
+        this.previousPageUI = lastPageUI;
-	}
+    }
 
-	public void setNextPageUI(ItemStack nextPageUI) {
+    public void setNextPageUI(ItemStack nextPageUI) {
-		this.nextPageUI = nextPageUI;
+        this.nextPageUI = nextPageUI;
-	}
+    }
 
-	public void setPreviousPageSlot(int slot) {
+    public void setPreviousPageSlot(int slot) {
-		this.previousPageSlot = slot;
+        this.previousPageSlot = slot;
-	}
+    }
 
-	public void setNextPageSlot(int slot) {
+    public void setNextPageSlot(int slot) {
-		this.nextPageSlot = slot;
+        this.nextPageSlot = slot;
-	}
+    }
 
-	@Override
+    @Override
-	public void openGUI(Player user) {
+    public void openGUI(Player user) {
-		if (previousPageSlot >= 0) {
+        if (previousPageSlot >= 0) {
-			if (hasPreviousPage()) {
+            if (hasPreviousPage()) {
-				setItem(previousPageSlot, new GUIItem(
+                setItem(previousPageSlot, new GUIItem(
-						previousPageUI == null ? getDefaultPreviousPage(user) : previousPageUI) {
+                        previousPageUI == null ? getDefaultPreviousPage(user) : previousPageUI) {
-					@Override
+                    @Override
-					public void onClick(ClickType type) {
+                    public void onClick(ClickType type) {
-						if (type == ClickType.RIGHT) {
+                        if (type == ClickType.RIGHT) {
-							goFirstPage();
+                            goFirstPage();
-						} else {
+                        } else {
-							goPreviousPage();
+                            goPreviousPage();
-						}
+                        }
-						openGUI(user);
+                        openGUI(user);
-					}
+                    }
-				});
+                });
-			} else {
+            } else {
-				setItem(previousPageSlot, null);
+                setItem(previousPageSlot, null);
-			}
+            }
-		}
+        }
 
-		if (nextPageSlot >= 0) {
+        if (nextPageSlot >= 0) {
-			if (hasNextPage()) {
+            if (hasNextPage()) {
-				setItem(nextPageSlot, new GUIItem(
+                setItem(nextPageSlot, new GUIItem(
-						nextPageUI == null ? getDefaultNextPage(user) : nextPageUI) {
+                        nextPageUI == null ? getDefaultNextPage(user) : nextPageUI) {
-					@Override
+                    @Override
-					public void onClick(ClickType type) {
+                    public void onClick(ClickType type) {
-						if (type == ClickType.RIGHT) {
+                        if (type == ClickType.RIGHT) {
-							goLastPage();
+                            goLastPage();
-						} else {
+                        } else {
-							goNextPage();
+                            goNextPage();
-						}
+                        }
-						openGUI(user);
+                        openGUI(user);
-					}
+                    }
-				});
+                });
-			} else {
+            } else {
-				setItem(nextPageSlot, null);
+                setItem(nextPageSlot, null);
-			}
+            }
-		}
+        }
 
 
-		super.openGUI(user);
+        super.openGUI(user);
-	}
+    }
 
-	private static ItemStack getDefaultNextPage(Player player) {
+    private static ItemStack getDefaultNextPage(Player player) {
-		return defaultNextPage != null ? defaultNextPage.apply(player) : null;
+        return defaultNextPage != null ? defaultNextPage.apply(player) : null;
-	}
+    }
 
-	private static ItemStack getDefaultPreviousPage(Player player) {
+    private static ItemStack getDefaultPreviousPage(Player player) {
-		return defaultPreviousPage != null ? defaultPreviousPage.apply(player) : null;
+        return defaultPreviousPage != null ? defaultPreviousPage.apply(player) : null;
-	}
+    }
 }

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

@@ -11,22 +11,22 @@ import java.util.List;
 
 public class CommonPagedGUI extends PagedGUI {
 
-	private int[] range;
+    private int[] range;
 
-	private CommonPagedGUI(GUIType type, String name) {
+    private CommonPagedGUI(GUIType type, String name) {
-		super(type, name);
+        super(type, name);
-	}
+    }
 
-	public CommonPagedGUI(GUIType type, String Name, int a, int b) {
+    public CommonPagedGUI(GUIType type, String Name, int a, int b) {
-		this(type, Name, toRange(type, a, b));
+        this(type, Name, toRange(type, a, b));
-	}
+    }
 
-	public CommonPagedGUI(GUIType type, String Name, int[] range) {
+    public CommonPagedGUI(GUIType type, String Name, int[] range) {
-		super(type, Name);
+        super(type, Name);
-		Arrays.sort(range);
+        Arrays.sort(range);
-		this.range = range;
+        this.range = range;
 
-	}
+    }
 
 
 	
@@ -41,122 +41,122 @@ public class CommonPagedGUI extends PagedGUI {
 	}
 	*/
 
-	private static int[] toRange(GUIType type, int a, int b) {
+    private static int[] toRange(GUIType type, int a, int b) {
-		if (a > b) {
+        if (a > b) {
-			a = a ^ b;
+            a = a ^ b;
-			b = a ^ b;
+            b = a ^ b;
-			a = a ^ b;
+            a = a ^ b;
-		}
+        }
 
-		int lineA = getLine(a);
+        int lineA = getLine(a);
-		int columnA = getColumn(a);
+        int columnA = getColumn(a);
-		int lineB = getLine(b);
+        int lineB = getLine(b);
-		int columnB = getColumn(b);
+        int columnB = getColumn(b);
 
-		if (lineB > type.getLines())
+        if (lineB > type.getLines())
-			throw new IndexOutOfBoundsException("页面内容范围超过了GUI的大小");
+            throw new IndexOutOfBoundsException("页面内容范围超过了GUI的大小");
 
-		int[] range = new int[(lineB - lineA + 1) * (columnB - columnA + 1)];
+        int[] range = new int[(lineB - lineA + 1) * (columnB - columnA + 1)];
 
-		for (int i = 0, l = 0; i < type.getSize(); i++) {
+        for (int i = 0, l = 0; i < type.getSize(); i++) {
-			int li = getLine(i);
+            int li = getLine(i);
-			int ci = getColumn(i);
+            int ci = getColumn(i);
-			if (li >= lineA && li <= lineB && ci >= columnA && ci <= columnB) {
+            if (li >= lineA && li <= lineB && ci >= columnA && ci <= columnB) {
-				range[l] = i;
+                range[l] = i;
-				l++;
+                l++;
-			}
+            }
-		}
+        }
 
-		return range;
+        return range;
-	}
+    }
 
-	private static int getLine(int i) {
+    private static int getLine(int i) {
-		return i / 9 + 1;
+        return i / 9 + 1;
-	}
+    }
 
-	private static int getColumn(int i) {
+    private static int getColumn(int i) {
-		return i % 9 + 1;
+        return i % 9 + 1;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean hasPreviousPage() {
+    public boolean hasPreviousPage() {
-		return page > 1;
+        return page > 1;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean hasNextPage() {
+    public boolean hasNextPage() {
-		return page < getLastPageNumber();
+        return page < getLastPageNumber();
-	}
+    }
 
 
-	/**
+    /**
-	 * 前往第一页
+     * 前往第一页
-	 */
+     */
-	public void goFirstPage() {
+    public void goFirstPage() {
-		if (hasPreviousPage())
+        if (hasPreviousPage())
-			this.page = 1;
+            this.page = 1;
-		else
+        else
-			throw new IndexOutOfBoundsException();
+            throw new IndexOutOfBoundsException();
-	}
+    }
 
 
-	/**
+    /**
-	 * 前往最后一页
+     * 前往最后一页
-	 */
+     */
-	public void goLastPage() {
+    public void goLastPage() {
-		if (hasNextPage())
+        if (hasNextPage())
-			this.page = getLastPageNumber();
+            this.page = getLastPageNumber();
-		else
+        else
-			throw new IndexOutOfBoundsException();
+            throw new IndexOutOfBoundsException();
-	}
+    }
 
 
-	/**
+    /**
-	 * 得到最后一页的页码
+     * 得到最后一页的页码
-	 *
+     *
-	 * @return 最后一页的页码
+     * @return 最后一页的页码
-	 */
+     */
-	public int getLastPageNumber() {
+    public int getLastPageNumber() {
-		return (this.container.size() / range.length) + 1;
+        return (this.container.size() / range.length) + 1;
-	}
+    }
 
-	/**
+    /**
-	 * 得到第一页的页码
+     * 得到第一页的页码
-	 *
+     *
-	 * @return 第一页页码(默认为1)
+     * @return 第一页页码(默认为1)
-	 */
+     */
-	public int getFirstPageNumber() {
+    public int getFirstPageNumber() {
-		return 1;
+        return 1;
-	}
+    }
 
 
-	@Override
+    @Override
-	public void openGUI(Player player) {
+    public void openGUI(Player player) {
-		if (container.isEmpty()) {
+        if (container.isEmpty()) {
-			super.openGUI(player);
+            super.openGUI(player);
-			return;
+            return;
-		}
+        }
-		List<GUIItem> list = new ArrayList<>();
+        List<GUIItem> list = new ArrayList<>();
-		int start = (page - 1) * range.length;
+        int start = (page - 1) * range.length;
-		for (int i = start; i < start + range.length; i++) {
+        for (int i = start; i < start + range.length; i++) {
-			if (i < container.size()) {
+            if (i < container.size()) {
-				list.add(container.get(i));
+                list.add(container.get(i));
-			} else {
+            } else {
-				break;
+                break;
-			}
+            }
-		}
+        }
 
-		int i = 0;
+        int i = 0;
-		Arrays.stream(range).forEach(index -> setItem(index, null));
+        Arrays.stream(range).forEach(index -> setItem(index, null));
-		for (int index : range) {
+        for (int index : range) {
-			if (i < list.size()) {
+            if (i < list.size()) {
-				setItem(index, list.get(i));
+                setItem(index, list.get(i));
-				i++;
+                i++;
-			} else {
+            } else {
-				break;
+                break;
-			}
+            }
-		}
+        }
-		super.openGUI(player);
+        super.openGUI(player);
-	}
+    }
 
 }

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

@@ -10,70 +10,70 @@ import java.util.List;
 
 public abstract class PagedGUI extends GUI {
 
-	List<GUIItem> container = new ArrayList<>();
+    List<GUIItem> container = new ArrayList<>();
-	public int page = 1;
+    public int page = 1;
 
-	public PagedGUI(GUIType type, String name) {
+    public PagedGUI(GUIType type, String name) {
-		super(type, name);
+        super(type, name);
-	}
+    }
 
-	public int addItem(GUIItem i) {
+    public int addItem(GUIItem i) {
-		container.add(i);
+        container.add(i);
-		return container.size() - 1;
+        return container.size() - 1;
-	}
+    }
 
-	/**
+    /**
-	 * 从GUI中移除一个物品
+     * 从GUI中移除一个物品
-	 *
+     *
-	 * @param item 物品
+     * @param item 物品
-	 */
+     */
-	public void removeItem(GUIItem item) {
+    public void removeItem(GUIItem item) {
-		container.remove(item);
+        container.remove(item);
-	}
+    }
 
-	/**
+    /**
-	 * 从GUI中移除一个物品
+     * 从GUI中移除一个物品
-	 *
+     *
-	 * @param slot 物品格子数
+     * @param slot 物品格子数
-	 */
+     */
-	public void removeItem(int slot) {
+    public void removeItem(int slot) {
-		container.remove(slot);
+        container.remove(slot);
-	}
+    }
 
-	public List<GUIItem> getItemsContainer() {
+    public List<GUIItem> getItemsContainer() {
-		return new ArrayList<>(container);
+        return new ArrayList<>(container);
-	}
+    }
 
-	/**
+    /**
-	 * 前往上一页
+     * 前往上一页
-	 */
+     */
-	public void goPreviousPage() {
+    public void goPreviousPage() {
-		if (hasPreviousPage())
+        if (hasPreviousPage())
-			page--;
+            page--;
-		else
+        else
-			throw new IndexOutOfBoundsException();
+            throw new IndexOutOfBoundsException();
-	}
+    }
 
 
-	/**
+    /**
-	 * 前往下一页
+     * 前往下一页
-	 */
+     */
-	public void goNextPage() {
+    public void goNextPage() {
-		if (hasNextPage())
+        if (hasNextPage())
-			page++;
+            page++;
-		else
+        else
-			throw new IndexOutOfBoundsException();
+            throw new IndexOutOfBoundsException();
-	}
+    }
 
 
-	/**
+    /**
-	 * @return 是否有上一页
+     * @return 是否有上一页
-	 */
+     */
-	public abstract boolean hasPreviousPage();
+    public abstract boolean hasPreviousPage();
 
-	/**
+    /**
-	 * @return 是否有下一页
+     * @return 是否有下一页
-	 */
+     */
-	public abstract boolean hasNextPage();
+    public abstract boolean hasNextPage();
 
 }

base/gui/src/test/java/ActionReadTest.java

@@ -1,4 +1,3 @@
-
 import cc.carm.lib.easyplugin.gui.configuration.GUIActionType;
 import cc.carm.lib.easyplugin.gui.configuration.GUIConfiguration;
 import org.bukkit.event.inventory.ClickType;
@@ -10,43 +9,43 @@ import java.util.List;
 public class ActionReadTest {
 
 
-	@Test
+    @Test
-	public void test() {
+    public void test() {
 
-		List<String> actions = Arrays.asList(
+        List<String> actions = Arrays.asList(
-				"[CHAT] 123123",
+                "[CHAT] 123123",
-				"[SHIFT_LEFT:CHAT] /test qwq",
+                "[SHIFT_LEFT:CHAT] /test qwq",
-				"[CONSOLE] say hello",
+                "[CONSOLE] say hello",
-				"[CLOSE]"
+                "[CLOSE]"
-		);
+        );
 
-		for (String actionString : actions) {
+        for (String actionString : actions) {
-			int prefixStart = actionString.indexOf("[");
+            int prefixStart = actionString.indexOf("[");
-			int prefixEnd = actionString.indexOf("]");
+            int prefixEnd = actionString.indexOf("]");
-			if (prefixStart < 0 || prefixEnd < 0) continue;
+            if (prefixStart < 0 || prefixEnd < 0) continue;
 
-			String prefix = actionString.substring(prefixStart + 1, prefixEnd);
+            String prefix = actionString.substring(prefixStart + 1, prefixEnd);
-			ClickType clickType = null;
+            ClickType clickType = null;
-			GUIActionType actionType;
+            GUIActionType actionType;
-			if (prefix.contains(":")) {
+            if (prefix.contains(":")) {
-				String[] args = prefix.split(":");
+                String[] args = prefix.split(":");
-				clickType = GUIConfiguration.readClickType(args[0]);
+                clickType = GUIConfiguration.readClickType(args[0]);
-				actionType = GUIActionType.readActionType(args[1]);
+                actionType = GUIActionType.readActionType(args[1]);
-			} else {
+            } else {
-				actionType = GUIActionType.readActionType(prefix);
+                actionType = GUIActionType.readActionType(prefix);
-			}
+            }
 
-			if (actionType == null) {
+            if (actionType == null) {
-				System.out.println("# " + actionString);
+                System.out.println("# " + actionString);
-				System.out.println("- actionType is Null");
+                System.out.println("- actionType is Null");
-				continue;
+                continue;
-			}
+            }
 
-			System.out.println("# " + actionType.name() + " " + (clickType == null ? "" : clickType.name()));
+            System.out.println("# " + actionType.name() + " " + (clickType == null ? "" : clickType.name()));
-			System.out.println("- " + actionString.substring(prefixEnd + 1).trim());
+            System.out.println("- " + actionString.substring(prefixEnd + 1).trim());
-		}
+        }
 
 
-	}
+    }
 
 }

base/main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -56,31 +56,9 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.9</version>
             <scope>provided</scope>
         </dependency>
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

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

@@ -7,26 +7,41 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.TabCompleter;
+import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 public abstract class EasyPlugin extends JavaPlugin {
 
-    protected EasyPluginMessageProvider messageProvider;
+    protected @NotNull EasyPluginMessageProvider messageProvider;
 
     public EasyPlugin() {
         this(EasyPluginMessageProvider.ZH_CN);
     }
 
-    public EasyPlugin(EasyPluginMessageProvider messageProvider) {
+    public EasyPlugin(@NotNull EasyPluginMessageProvider messageProvider) {
+        this.messageProvider = messageProvider;
+    }
+
+    protected EasyPlugin(JavaPluginLoader loader, PluginDescriptionFile descriptionFile, File dataFolder, File file) {
+        this(EasyPluginMessageProvider.ZH_CN, loader, descriptionFile, dataFolder, file);
+    }
+
+    protected EasyPlugin(@NotNull EasyPluginMessageProvider messageProvider,
+                         JavaPluginLoader loader, PluginDescriptionFile descriptionFile, File dataFolder, File file) {
+        super(loader, descriptionFile, dataFolder, file);
         this.messageProvider = messageProvider;
     }
 
@@ -134,6 +149,21 @@ public abstract class EasyPlugin extends JavaPlugin {
         if (isDebugging()) print("&8[DEBUG] &r", messages);
     }
 
+    public void callEventSync(Event event) {
+        getScheduler().run(() -> Bukkit.getPluginManager().callEvent(event));
+    }
+
+    public void callEventAsync(Event event) {
+        getScheduler().runAsync(() -> Bukkit.getPluginManager().callEvent(event));
+    }
+
+    public @NotNull <T extends Event> CompletableFuture<T> callEventFuture(T event) {
+        return CompletableFuture.supplyAsync(() -> {
+            Bukkit.getPluginManager().callEvent(event);
+            return event;
+        });
+    }
+
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean hasOverride(String methodName) {
         Map<Method, Method> methodMap = new HashMap<>();

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

@@ -8,7 +8,7 @@ import java.util.stream.Collectors;
 
 public class ColorParser {
 
-    public static final Pattern HEX_PATTERN = Pattern.compile("&\\(&?#([0-9a-fA-F]{6})\\)");
+    public static final Pattern HEX_PATTERN = Pattern.compile("&\\(&?#([\\da-fA-F]{6})\\)");
 
     public static String parse(String text) {
         return parseBaseColor(parseHexColor(text));

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

@@ -14,131 +14,131 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class ItemStackFactory {
-	ItemStack item;
+    ItemStack item;
 
-	private ItemStackFactory() {
+    private ItemStackFactory() {
-	}
+    }
 
-	public ItemStackFactory(ItemStack is) {
+    public ItemStackFactory(ItemStack is) {
-		this.item = is.clone();
+        this.item = is.clone();
-	}
+    }
 
-	public ItemStackFactory(Material type) {
+    public ItemStackFactory(Material type) {
-		this(type, 1);
+        this(type, 1);
-	}
+    }
 
-	public ItemStackFactory(Material type, int amount) {
+    public ItemStackFactory(Material type, int amount) {
-		this(type, amount, (short) 0);
+        this(type, amount, (short) 0);
-	}
+    }
 
-	public ItemStackFactory(Material type, int amount, short data) {
+    public ItemStackFactory(Material type, int amount, short data) {
-		this.item = new ItemStack(type, amount, data);
+        this.item = new ItemStack(type, amount, data);
-	}
+    }
 
-	public ItemStackFactory(Material type, int amount, int data) {
+    public ItemStackFactory(Material type, int amount, int data) {
-		this(type, amount, (short) data);
+        this(type, amount, (short) data);
-	}
+    }
 
-	public ItemStack toItemStack() {
+    public ItemStack toItemStack() {
-		return this.item;
+        return this.item;
-	}
+    }
 
-	public ItemStackFactory setType(Material type) {
+    public ItemStackFactory setType(Material type) {
-		this.item.setType(type);
+        this.item.setType(type);
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory setDurability(int i) {
+    public ItemStackFactory setDurability(int i) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im instanceof Damageable) {
+        if (im instanceof Damageable) {
-			((Damageable) im).setDamage(i);
+            ((Damageable) im).setDamage(i);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory setAmount(int a) {
+    public ItemStackFactory setAmount(int a) {
-		this.item.setAmount(a);
+        this.item.setAmount(a);
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory setDisplayName(@NotNull String name) {
+    public ItemStackFactory setDisplayName(@NotNull String name) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.setDisplayName(ColorParser.parse(name));
+            im.setDisplayName(ColorParser.parse(name));
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory setLore(@NotNull List<String> loreList) {
+    public ItemStackFactory setLore(@NotNull List<String> loreList) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.setLore(
+            im.setLore(
-					loreList.stream()
+                    loreList.stream()
-							.map(ColorParser::parse)
+                            .map(ColorParser::parse)
-							.collect(Collectors.toList())
+                            .collect(Collectors.toList())
-			);
+            );
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory addLore(@NotNull String s) {
+    public ItemStackFactory addLore(@NotNull String s) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			List<String> lore = im.getLore() != null ? im.getLore() : new ArrayList<>();
+            List<String> lore = im.getLore() != null ? im.getLore() : new ArrayList<>();
-			lore.add(ColorParser.parse(s));
+            lore.add(ColorParser.parse(s));
-			im.setLore(lore);
+            im.setLore(lore);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory addEnchant(@NotNull Enchantment enchant, int level, boolean ignoreLevelRestriction) {
+    public ItemStackFactory addEnchant(@NotNull Enchantment enchant, int level, boolean ignoreLevelRestriction) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.addEnchant(enchant, level, ignoreLevelRestriction);
+            im.addEnchant(enchant, level, ignoreLevelRestriction);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
 
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory removeEnchant(@NotNull Enchantment enchant) {
+    public ItemStackFactory removeEnchant(@NotNull Enchantment enchant) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.removeEnchant(enchant);
+            im.removeEnchant(enchant);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory addFlag(@NotNull ItemFlag flag) {
+    public ItemStackFactory addFlag(@NotNull ItemFlag flag) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.addItemFlags(flag);
+            im.addItemFlags(flag);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
 
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory removeFlag(@NotNull ItemFlag flag) {
+    public ItemStackFactory removeFlag(@NotNull ItemFlag flag) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.removeItemFlags(flag);
+            im.removeItemFlags(flag);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	public ItemStackFactory setUnbreakable(boolean unbreakable) {
+    public ItemStackFactory setUnbreakable(boolean unbreakable) {
-		ItemMeta im = this.item.getItemMeta();
+        ItemMeta im = this.item.getItemMeta();
-		if (im != null) {
+        if (im != null) {
-			im.setUnbreakable(unbreakable);
+            im.setUnbreakable(unbreakable);
-			this.item.setItemMeta(im);
+            this.item.setItemMeta(im);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 }

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

@@ -12,344 +12,344 @@ import java.util.concurrent.Callable;
 @SuppressWarnings("DuplicatedCode")
 public class SchedulerUtils {
 
-	private final JavaPlugin plugin;
+    private final JavaPlugin plugin;
 
-	public SchedulerUtils(JavaPlugin plugin) {
+    public SchedulerUtils(JavaPlugin plugin) {
-		this.plugin = plugin;
+        this.plugin = plugin;
-	}
+    }
 
-	private JavaPlugin getPlugin() {
+    private JavaPlugin getPlugin() {
-		return plugin;
+        return plugin;
-	}
+    }
 
 
-	/**
+    /**
-	 * 在服务端主线程中执行一个任务
+     * 在服务端主线程中执行一个任务
-	 *
+     *
-	 * @param runnable 需要执行的任务
+     * @param runnable 需要执行的任务
-	 */
+     */
-	public void run(Runnable runnable) {
+    public void run(Runnable runnable) {
-		Bukkit.getScheduler().runTask(getPlugin(), runnable);
+        Bukkit.getScheduler().runTask(getPlugin(), runnable);
-	}
+    }
 
 
-	/**
+    /**
-	 * 异步执行一个任务。
+     * 异步执行一个任务。
-	 *
+     *
-	 * @param runnable 需要执行的任务
+     * @param runnable 需要执行的任务
-	 */
+     */
-	public void runAsync(Runnable runnable) {
+    public void runAsync(Runnable runnable) {
-		Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), runnable);
+        Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), runnable);
-	}
+    }
 
-	/**
+    /**
-	 * 在主线程延时执行一个任务。
+     * 在主线程延时执行一个任务。
-	 *
+     *
-	 * @param delay    延迟的ticks
+     * @param delay    延迟的ticks
-	 * @param runnable 需要执行的任务
+     * @param runnable 需要执行的任务
-	 */
+     */
-	public void runLater(long delay, Runnable runnable) {
+    public void runLater(long delay, Runnable runnable) {
-		Bukkit.getScheduler().runTaskLater(getPlugin(), runnable, delay);
+        Bukkit.getScheduler().runTaskLater(getPlugin(), runnable, delay);
-	}
+    }
 
-	/**
+    /**
-	 * 异步延时执行一个任务。
+     * 异步延时执行一个任务。
-	 *
+     *
-	 * @param delay    延迟的ticks
+     * @param delay    延迟的ticks
-	 * @param runnable 需要执行的任务
+     * @param runnable 需要执行的任务
-	 */
+     */
-	public void runLaterAsync(long delay, Runnable runnable) {
+    public void runLaterAsync(long delay, Runnable runnable) {
-		Bukkit.getScheduler().runTaskLaterAsynchronously(getPlugin(), runnable, delay);
+        Bukkit.getScheduler().runTaskLaterAsynchronously(getPlugin(), runnable, delay);
-	}
+    }
 
-	/**
+    /**
-	 * 间隔一段时间按顺序执行列表中的任务
+     * 间隔一段时间按顺序执行列表中的任务
-	 *
+     *
-	 * @param interval 间隔时间
+     * @param interval 间隔时间
-	 * @param tasks    任务列表
+     * @param tasks    任务列表
-	 */
+     */
-	public void runAtInterval(long interval, Runnable... tasks) {
+    public void runAtInterval(long interval, Runnable... tasks) {
-		runAtInterval(0L, interval, tasks);
+        runAtInterval(0L, interval, tasks);
-	}
+    }
 
 
-	/**
+    /**
-	 * 间隔一段时间按顺序执行列表中的任务
+     * 间隔一段时间按顺序执行列表中的任务
-	 *
+     *
-	 * @param delay    延迟时间
+     * @param delay    延迟时间
-	 * @param interval 间隔时间
+     * @param interval 间隔时间
-	 * @param tasks    任务列表
+     * @param tasks    任务列表
-	 */
+     */
-	public void runAtInterval(long delay, long interval, Runnable... tasks) {
+    public void runAtInterval(long delay, long interval, Runnable... tasks) {
-		new BukkitRunnable() {
+        new BukkitRunnable() {
-			private int index;
+            private int index;
 
-			@Override
+            @Override
-			public void run() {
+            public void run() {
-				if (this.index >= tasks.length) {
+                if (this.index >= tasks.length) {
-					this.cancel();
+                    this.cancel();
-					return;
+                    return;
-				}
+                }
 
-				tasks[index].run();
+                tasks[index].run();
-				index++;
+                index++;
-			}
+            }
-		}.runTaskTimer(getPlugin(), delay, interval);
+        }.runTaskTimer(getPlugin(), delay, interval);
-	}
+    }
 
-	/**
+    /**
-	 * 间隔一段时间按顺序异步执行列表中的任务
+     * 间隔一段时间按顺序异步执行列表中的任务
-	 *
+     *
-	 * @param interval 间隔时间
+     * @param interval 间隔时间
-	 * @param tasks    任务列表
+     * @param tasks    任务列表
-	 */
+     */
-	public void runAtIntervalAsync(long interval, Runnable... tasks) {
+    public void runAtIntervalAsync(long interval, Runnable... tasks) {
-		runAtIntervalAsync(0L, interval, tasks);
+        runAtIntervalAsync(0L, interval, tasks);
-	}
+    }
 
-	/**
+    /**
-	 * 间隔一段时间按顺序异步执行列表中的任务
+     * 间隔一段时间按顺序异步执行列表中的任务
-	 *
+     *
-	 * @param delay    延迟时间
+     * @param delay    延迟时间
-	 * @param interval 间隔时间
+     * @param interval 间隔时间
-	 * @param tasks    任务列表
+     * @param tasks    任务列表
-	 */
+     */
-	public void runAtIntervalAsync(long delay, long interval, Runnable... tasks) {
+    public void runAtIntervalAsync(long delay, long interval, Runnable... tasks) {
-		new BukkitRunnable() {
+        new BukkitRunnable() {
-			private int index;
+            private int index;
 
-			@Override
+            @Override
-			public void run() {
+            public void run() {
-				if (this.index >= tasks.length) {
+                if (this.index >= tasks.length) {
-					this.cancel();
+                    this.cancel();
-					return;
+                    return;
-				}
+                }
 
-				tasks[index].run();
+                tasks[index].run();
-				index++;
+                index++;
-			}
+            }
-		}.runTaskTimerAsynchronously(getPlugin(), delay, interval);
+        }.runTaskTimerAsynchronously(getPlugin(), delay, interval);
-	}
+    }
 
-	/**
+    /**
-	 * 重复执行一个任务。
+     * 重复执行一个任务。
-	 *
+     *
-	 * @param repetitions 重复次数
+     * @param repetitions 重复次数
-	 * @param interval    间隔时间
+     * @param interval    间隔时间
-	 * @param task        任务
+     * @param task        任务
-	 * @param onComplete  结束时执行的任务
+     * @param onComplete  结束时执行的任务
-	 */
+     */
-	public void repeat(int repetitions, long interval, Runnable task, Runnable onComplete) {
+    public void repeat(int repetitions, long interval, Runnable task, Runnable onComplete) {
-		new BukkitRunnable() {
+        new BukkitRunnable() {
-			private int index;
+            private int index;
 
-			@Override
+            @Override
-			public void run() {
+            public void run() {
-				index++;
+                index++;
-				if (this.index >= repetitions) {
+                if (this.index >= repetitions) {
-					this.cancel();
+                    this.cancel();
-					if (onComplete == null) {
+                    if (onComplete == null) {
-						return;
+                        return;
-					}
+                    }
 
-					onComplete.run();
+                    onComplete.run();
-					return;
+                    return;
-				}
+                }
 
-				task.run();
+                task.run();
-			}
+            }
-		}.runTaskTimer(getPlugin(), 0L, interval);
+        }.runTaskTimer(getPlugin(), 0L, interval);
-	}
+    }
 
-	/**
+    /**
-	 * 重复执行一个任务。
+     * 重复执行一个任务。
-	 *
+     *
-	 * @param repetitions 重复次数
+     * @param repetitions 重复次数
-	 * @param interval    间隔时间
+     * @param interval    间隔时间
-	 * @param task        任务
+     * @param task        任务
-	 * @param onComplete  结束时执行的任务
+     * @param onComplete  结束时执行的任务
-	 */
+     */
-	public void repeatAsync(int repetitions, long interval, Runnable task, Runnable onComplete) {
+    public void repeatAsync(int repetitions, long interval, Runnable task, Runnable onComplete) {
-		new BukkitRunnable() {
+        new BukkitRunnable() {
-			private int index;
+            private int index;
 
-			@Override
+            @Override
-			public void run() {
+            public void run() {
-				index++;
+                index++;
-				if (this.index >= repetitions) {
+                if (this.index >= repetitions) {
-					this.cancel();
+                    this.cancel();
-					if (onComplete == null) {
+                    if (onComplete == null) {
-						return;
+                        return;
-					}
+                    }
 
-					onComplete.run();
+                    onComplete.run();
-					return;
+                    return;
-				}
+                }
 
-				task.run();
+                task.run();
-			}
+            }
-		}.runTaskTimerAsynchronously(getPlugin(), 0L, interval);
+        }.runTaskTimerAsynchronously(getPlugin(), 0L, interval);
-	}
+    }
 
-	/**
+    /**
-	 * 在满足某个条件时，重复执行一个任务。
+     * 在满足某个条件时，重复执行一个任务。
-	 *
+     *
-	 * @param interval   重复间隔时间
+     * @param interval   重复间隔时间
-	 * @param predicate  条件
+     * @param predicate  条件
-	 * @param task       任务
+     * @param task       任务
-	 * @param onComplete 结束时执行的任务
+     * @param onComplete 结束时执行的任务
-	 */
+     */
-	public void repeatWhile(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
+    public void repeatWhile(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
-		new BukkitRunnable() {
+        new BukkitRunnable() {
-			@Override
+            @Override
-			public void run() {
+            public void run() {
-				try {
+                try {
-					if (!predicate.call()) {
+                    if (!predicate.call()) {
-						this.cancel();
+                        this.cancel();
-						if (onComplete == null) {
+                        if (onComplete == null) {
-							return;
+                            return;
-						}
+                        }
 
-						onComplete.run();
+                        onComplete.run();
-						return;
+                        return;
-					}
+                    }
 
-					task.run();
+                    task.run();
-				} catch (Exception e) {
+                } catch (Exception e) {
-					e.printStackTrace();
+                    e.printStackTrace();
-				}
+                }
-			}
+            }
-		}.runTaskTimer(getPlugin(), 0L, interval);
+        }.runTaskTimer(getPlugin(), 0L, interval);
-	}
+    }
 
-	/**
+    /**
-	 * 在满足某个条件时，重复执行一个任务。
+     * 在满足某个条件时，重复执行一个任务。
-	 *
+     *
-	 * @param interval   重复间隔时间
+     * @param interval   重复间隔时间
-	 * @param predicate  条件
+     * @param predicate  条件
-	 * @param task       任务
+     * @param task       任务
-	 * @param onComplete 结束时执行的任务
+     * @param onComplete 结束时执行的任务
-	 */
+     */
-	public void repeatWhileAsync(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
+    public void repeatWhileAsync(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
-		new BukkitRunnable() {
+        new BukkitRunnable() {
-			@Override
+            @Override
-			public void run() {
+            public void run() {
-				try {
+                try {
-					if (!predicate.call()) {
+                    if (!predicate.call()) {
-						this.cancel();
+                        this.cancel();
-						if (onComplete == null) {
+                        if (onComplete == null) {
-							return;
+                            return;
-						}
+                        }
 
-						onComplete.run();
+                        onComplete.run();
-						return;
+                        return;
-					}
+                    }
 
-					task.run();
+                    task.run();
-				} catch (Exception e) {
+                } catch (Exception e) {
-					e.printStackTrace();
+                    e.printStackTrace();
-				}
+                }
-			}
+            }
-		}.runTaskTimerAsynchronously(getPlugin(), 0L, interval);
+        }.runTaskTimerAsynchronously(getPlugin(), 0L, interval);
-	}
+    }
 
-	public interface Task {
+    public interface Task {
-		void start(Runnable onComplete);
+        void start(Runnable onComplete);
-	}
+    }
 
-	public class TaskBuilder {
+    public class TaskBuilder {
-		private final Queue<Task> taskList;
+        private final Queue<Task> taskList;
 
-		public TaskBuilder() {
+        public TaskBuilder() {
-			this.taskList = new LinkedList<>();
+            this.taskList = new LinkedList<>();
-		}
+        }
 
-		public TaskBuilder append(TaskBuilder builder) {
+        public TaskBuilder append(TaskBuilder builder) {
-			this.taskList.addAll(builder.taskList);
+            this.taskList.addAll(builder.taskList);
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendDelay(long delay) {
+        public TaskBuilder appendDelay(long delay) {
-			this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, onComplete));
+            this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, onComplete));
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendTask(Runnable task) {
+        public TaskBuilder appendTask(Runnable task) {
-			this.taskList.add(onComplete ->
+            this.taskList.add(onComplete ->
-			{
+            {
-				task.run();
+                task.run();
-				onComplete.run();
+                onComplete.run();
-			});
+            });
 
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendTask(Task task) {
+        public TaskBuilder appendTask(Task task) {
-			this.taskList.add(task);
+            this.taskList.add(task);
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendDelayedTask(long delay, Runnable task) {
+        public TaskBuilder appendDelayedTask(long delay, Runnable task) {
-			this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, () ->
+            this.taskList.add(onComplete -> SchedulerUtils.this.runLater(delay, () ->
-			{
+            {
-				task.run();
+                task.run();
-				onComplete.run();
+                onComplete.run();
-			}));
+            }));
 
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendTasks(long delay, long interval, Runnable... tasks) {
+        public TaskBuilder appendTasks(long delay, long interval, Runnable... tasks) {
-			this.taskList.add(onComplete ->
+            this.taskList.add(onComplete ->
-			{
+            {
-				Runnable[] runnables = Arrays.copyOf(tasks, tasks.length + 1);
+                Runnable[] runnables = Arrays.copyOf(tasks, tasks.length + 1);
-				runnables[runnables.length - 1] = onComplete;
+                runnables[runnables.length - 1] = onComplete;
-				SchedulerUtils.this.runAtInterval(delay, interval, runnables);
+                SchedulerUtils.this.runAtInterval(delay, interval, runnables);
-			});
+            });
 
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendRepeatingTask(int repetitions, long interval, Runnable task) {
+        public TaskBuilder appendRepeatingTask(int repetitions, long interval, Runnable task) {
-			this.taskList.add(onComplete -> SchedulerUtils.this.repeat(repetitions, interval, task, onComplete));
+            this.taskList.add(onComplete -> SchedulerUtils.this.repeat(repetitions, interval, task, onComplete));
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder appendConditionalRepeatingTask(long interval, Callable<Boolean> predicate, Runnable task) {
+        public TaskBuilder appendConditionalRepeatingTask(long interval, Callable<Boolean> predicate, Runnable task) {
-			this.taskList.add(onComplete -> SchedulerUtils.this.repeatWhile(interval, predicate, task, onComplete));
+            this.taskList.add(onComplete -> SchedulerUtils.this.repeatWhile(interval, predicate, task, onComplete));
-			return this;
+            return this;
-		}
+        }
 
-		public TaskBuilder waitFor(Callable<Boolean> predicate) {
+        public TaskBuilder waitFor(Callable<Boolean> predicate) {
-			this.taskList.add(onComplete -> new BukkitRunnable() {
+            this.taskList.add(onComplete -> new BukkitRunnable() {
-				@Override
+                @Override
-				public void run() {
+                public void run() {
-					try {
+                    try {
-						if (!predicate.call()) {
+                        if (!predicate.call()) {
-							return;
+                            return;
-						}
+                        }
 
-						this.cancel();
+                        this.cancel();
-						onComplete.run();
+                        onComplete.run();
-					} catch (Exception e) {
+                    } catch (Exception e) {
-						e.printStackTrace();
+                        e.printStackTrace();
-					}
+                    }
-				}
+                }
-			}.runTaskTimer(getPlugin(), 0L, 1L));
+            }.runTaskTimer(getPlugin(), 0L, 1L));
-			return this;
+            return this;
-		}
+        }
 
-		public void runTasks() {
+        public void runTasks() {
-			this.startNext();
+            this.startNext();
-		}
+        }
 
-		private void startNext() {
+        private void startNext() {
-			Task task = this.taskList.poll();
+            Task task = this.taskList.poll();
-			if (task == null) {
+            if (task == null) {
-				return;
+                return;
-			}
+            }
 
-			task.start(this::startNext);
+            task.start(this::startNext);
-		}
+        }
-	}
+    }
 }

base/storage/pom.xml

@@ -0,0 +1,27 @@
+<?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.7</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-storage</artifactId>
+    <packaging>jar</packaging>
+
+    <name>EasyPlugin-Storage</name>
+    <description>轻松插件存储接口模块，包含存储相关的统一接口。</description>
+    <url>https://github.com/CarmJos/EasyPlugin</url>
+
+
+</project>

base/storage/src/main/java/cc/carm/lib/easyplugin/storage/DataStorage.java

@@ -0,0 +1,40 @@
+package cc.carm.lib.easyplugin.storage;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface DataStorage<K, T> {
+
+    /**
+     * 在插件加载存储源时执行。
+     *
+     * @throws Exception 当出现任何错误时抛出
+     */
+    void initialize() throws Exception;
+
+    /**
+     * 在插件被卸载时执行。
+     */
+    void shutdown();
+
+    /**
+     * 用于加载数据的方法。<b>该方法应当异步运行！</b>
+     * <br>
+     * <br>若不存在对应数据，请返回 null 。
+     * <br>若加载出现任何错误，请抛出异常。
+     *
+     * @param key 数据主键
+     * @throws Exception 当出现任何错误时抛出
+     */
+    @Nullable
+    T loadData(@NotNull K key) throws Exception;
+
+    /**
+     * 用于保存数据的方法。 <b>该方法应当被异步运行！</b>
+     *
+     * @param data 数据
+     * @throws Exception 当出现任何错误时抛出
+     */
+    void saveData(@NotNull T data) throws Exception;
+
+}

base/storage/src/main/java/cc/carm/lib/easyplugin/storage/StorageType.java

@@ -0,0 +1,19 @@
+package cc.carm.lib.easyplugin.storage;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public interface StorageType<K, T, S extends DataStorage<K, T>> {
+
+    int getID();
+
+    @NotNull List<String> getAlias();
+
+    @NotNull Class<? extends S> getStorageClass();
+
+    default @NotNull S createStorage() throws Exception {
+        return getStorageClass().newInstance();
+    }
+
+}

base/storage/src/main/java/cc/carm/lib/easyplugin/storage/file/FileBasedStorage.java

@@ -0,0 +1,31 @@
+package cc.carm.lib.easyplugin.storage.file;
+
+import cc.carm.lib.easyplugin.storage.DataStorage;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
+public abstract class FileBasedStorage<K, T> implements DataStorage<K, T> {
+
+
+    protected final String fileName;
+    protected File dataFile;
+
+    public FileBasedStorage(String fileName) {
+        this.fileName = fileName;
+    }
+
+    protected @NotNull File initializeFile(@NotNull File parentFolder) throws Exception {
+        this.dataFile = new File(parentFolder, fileName);
+        if (!dataFile.exists()) {
+            if (!dataFile.createNewFile()) throw new Exception("无法创建数据文件！");
+        } else if (dataFile.isDirectory()) {
+            throw new Exception("文件路径对应的不是一个文件！");
+        }
+        return dataFile;
+    }
+
+    public File getDataFile() {
+        return dataFile;
+    }
+}

base/storage/src/main/java/cc/carm/lib/easyplugin/storage/file/FolderBasedStorage.java

@@ -0,0 +1,46 @@
+package cc.carm.lib.easyplugin.storage.file;
+
+import cc.carm.lib.easyplugin.storage.DataStorage;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public abstract class FolderBasedStorage<K, T> implements DataStorage<K, T> {
+
+    protected final @NotNull String folderPath;
+    protected File dataFolder;
+
+    public FolderBasedStorage(@NotNull String folderPath) {
+        this.folderPath = folderPath;
+    }
+
+    protected @NotNull File initializeFolder(@NotNull File parentFolder) throws Exception {
+        this.dataFolder = new File(parentFolder, folderPath);
+        if (!dataFolder.exists()) {
+            if (!dataFolder.mkdir()) {
+                throw new Exception("无法创建数据文件夹！");
+            }
+        } else if (!dataFolder.isDirectory()) {
+            throw new Exception("数据文件夹路径对应的不是一个文件夹！");
+        }
+        return dataFolder;
+    }
+
+    protected @NotNull List<File> listFiles() {
+        if (this.dataFolder == null) return Collections.emptyList();
+        if (!this.dataFolder.isDirectory()) return Collections.emptyList();
+
+        File[] files = this.dataFolder.listFiles();
+        if (files == null) return Collections.emptyList();
+
+        return Arrays.asList(files);
+    }
+
+    public File getDataFolder() {
+        return dataFolder;
+    }
+
+}

base/storage/src/main/java/cc/carm/lib/easyplugin/storage/file/YAMLBasedStorage.java

@@ -0,0 +1,24 @@
+package cc.carm.lib.easyplugin.storage.file;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
+public abstract class YAMLBasedStorage<K, T> extends FileBasedStorage<K, T> {
+
+    protected FileConfiguration configuration;
+
+    public YAMLBasedStorage(String fileName) {
+        super(fileName);
+    }
+
+    protected @NotNull FileConfiguration initializeConfiguration(@NotNull File parentFolder) throws Exception {
+        return this.configuration = YamlConfiguration.loadConfiguration(initializeFile(parentFolder));
+    }
+
+    public FileConfiguration getConfiguration() {
+        return configuration;
+    }
+}

base/storage/src/main/java/cc/carm/lib/easyplugin/storage/plugin/PluginBasedStorage.java

@@ -0,0 +1,31 @@
+package cc.carm.lib.easyplugin.storage.plugin;
+
+import cc.carm.lib.easyplugin.storage.DataStorage;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+public abstract class PluginBasedStorage<K, T> implements DataStorage<K, T> {
+
+    protected Plugin dependPlugin;
+
+    public PluginBasedStorage(String dependPluginName) {
+        this(Bukkit.getPluginManager().getPlugin(dependPluginName));
+    }
+
+    public PluginBasedStorage(Plugin dependPlugin) {
+        this.dependPlugin = dependPlugin;
+    }
+
+    @Override
+    public void initialize() throws NullPointerException {
+        if (dependPlugin == null) {
+            throw new NullPointerException("该存储类型依赖的插件不存在，请检查配置文件");
+        }
+    }
+
+    public Plugin getDependPlugin() {
+        return dependPlugin;
+    }
+
+
+}

collection/all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</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.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -50,39 +50,6 @@
         <url>https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <distributionManagement>
-        <downloadUrl>https://github.com/CarmJos/EasyPlugin/releases</downloadUrl>
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
-        </repository>
-    </distributionManagement>
-
-    <repositories>
-
-        <repository>
-            <id>carm-repo</id>
-            <name>Carm's Repo</name>
-            <url>https://repo.carm.cc/repository/maven-public/</url>
-        </repository>
-
-        <repository>
-            <id>central</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/CarmJos/*</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-
-    </repositories>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -90,21 +57,11 @@
                 <artifactId>easyplugin-main</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.parent.groupId}</groupId>
-                <artifactId>easyplugin-configuration</artifactId>
-                <version>${project.parent.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.parent.groupId}</groupId>
                 <artifactId>easyplugin-command</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-gui</artifactId>
@@ -112,7 +69,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.parent.groupId}</groupId>
-                <artifactId>easyplugin-placeholderapi</artifactId>
+                <artifactId>easyplugin-papi</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
             <dependency>
@@ -120,11 +77,6 @@
                 <artifactId>easyplugin-vault</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.parent.groupId}</groupId>
-                <artifactId>easyplugin-lp</artifactId>
-                <version>${project.parent.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -139,6 +91,11 @@
             <artifactId>easyplugin-gui</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easyplugin-command</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>easyplugin-placeholderapi</artifactId>

collection/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -60,18 +60,10 @@
             <type>pom</type>
 
             <exclusions>
-                <exclusion>
-                    <groupId>cc.carm.lib</groupId>
-                    <artifactId>easyplugin-github</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>cc.carm.lib</groupId>
                     <artifactId>easyplugin-placeholderapi</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>cc.carm.lib</groupId>
-                    <artifactId>easyplugin-lp</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>cc.carm.lib</groupId>
                     <artifactId>easyplugin-vault</artifactId>

extension/gh-checker/pom.xml

@@ -0,0 +1,34 @@
+<?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.7</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-githubchecker</artifactId>
+    <packaging>jar</packaging>
+
+    <name>EasyPlugin-GithubChecker</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>githubreleases4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

extension/gh-checker/src/main/java/cc/carm/lib/easyplugin/updatechecker/GHUpdateChecker.java

@@ -0,0 +1,84 @@
+package cc.carm.lib.easyplugin.updatechecker;
+
+import cc.carm.lib.githubreleases4j.GithubReleases4J;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class GHUpdateChecker {
+
+    protected static final @NotNull Pattern GH_URL_PATTERN = Pattern.compile("^https?://github.com/([A-Za-z\\d-_]+)/([^/]*?)/?");
+
+    public static @NotNull GHUpdateChecker of(@NotNull Logger logger, @NotNull String owner, @NotNull String repo) {
+        return new GHUpdateChecker(logger, owner, repo);
+    }
+
+    public static @NotNull GHUpdateChecker of(@NotNull Plugin plugin) {
+        return new GHUpdateChecker(plugin.getLogger(), getGithubOwner(plugin), plugin.getName());
+    }
+
+    public static @NotNull Runnable runner(@NotNull Logger logger,
+                                           @NotNull String owner, @NotNull String repo,
+                                           @NotNull String currentVersion) {
+        return of(logger, owner, repo).runner(currentVersion);
+    }
+
+    public static @NotNull Runnable runner(@NotNull Plugin plugin) {
+        return of(plugin).runner(plugin.getDescription().getVersion());
+    }
+
+    protected final @NotNull Logger logger;
+    protected final @NotNull String owner;
+    protected final @NotNull String repo;
+
+    public GHUpdateChecker(@NotNull Logger logger, @NotNull String owner, @NotNull String repo) {
+        this.logger = logger;
+        this.owner = owner;
+        this.repo = repo;
+    }
+
+    public void checkUpdate(@NotNull String currentVersion) {
+        Integer behindVersions = GithubReleases4J.getVersionBehind(owner, repo, currentVersion);
+        String downloadURL = GithubReleases4J.getReleasesURL(owner, repo);
+
+        if (behindVersions == null) {
+            this.logger.severe("检查更新失败，请您定期查看插件是否更新，避免安全问题。");
+            this.logger.severe("下载地址 " + downloadURL);
+        } else if (behindVersions == 0) {
+            this.logger.info("检查完成，当前已是最新版本。");
+        } else if (behindVersions > 0) {
+            this.logger.info("发现新版本! 目前已落后 " + behindVersions + " 个版本。");
+            this.logger.info("最新版下载地址 " + downloadURL);
+        } else {
+            this.logger.severe("检查更新失败! 当前版本未知，请您使用原生版本以避免安全问题。");
+            this.logger.severe("最新版下载地址 " + downloadURL);
+        }
+    }
+
+    public Runnable runner(@NotNull String currentVersion) {
+        return () -> checkUpdate(currentVersion);
+    }
+
+    protected static String getGithubOwner(Plugin plugin) {
+        // 首先，尝试从插件提供的网址中获取OWNER
+        String websiteOwner = getGithubOwner(plugin.getDescription().getWebsite());
+        if (websiteOwner != null && !websiteOwner.isEmpty()) return websiteOwner;
+
+        // 如果插件提供的网址中没有，则尝试获取插件的首位作者名
+        List<String> authors = plugin.getDescription().getAuthors();
+        if (!authors.isEmpty()) return authors.get(0);
+
+        // 再没有的话只能返回插件的名称了
+        return plugin.getName();
+    }
+
+    protected static String getGithubOwner(String url) {
+        Matcher matcher = GH_URL_PATTERN.matcher(url);
+        return matcher.find() ? matcher.group(1) : null;
+    }
+
+}

extension/gh-checker/src/test/java/cc/carm/lib/easyplugin/updatechecker/RegexTest.java

@@ -0,0 +1,16 @@
+package cc.carm.lib.easyplugin.updatechecker;
+
+import org.junit.Test;
+
+public class RegexTest {
+
+
+    @Test
+    public void onTest() {
+        System.out.println(GHUpdateChecker.getGithubOwner("https://github.com/CarmJos/EasyPlugin"));
+        System.out.println(GHUpdateChecker.getGithubOwner("https://github.com/Ghost-chu/QuickShop-Hikari/pulls"));
+        System.out.println(GHUpdateChecker.getGithubOwner("https://github.com/QWQ123/QuickShop"));
+
+    }
+
+}

extension/papi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -22,4 +22,14 @@
 
     <name>EasyPlugin-PlaceholderAPI</name>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
 </project>

extension/vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.2</version>
+        <version>1.4.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>com.github.MilkBowl</groupId>
             <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
             <scope>provided</scope>
         </dependency>
 

pom.xml

@@ -10,12 +10,17 @@
         <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>
+
+        <dep.spigot>1.3.1</dep.spigot>
+        <dep.githubreleases4j>1.3.1</dep.githubreleases4j>
+
+
     </properties>
 
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.2</version>
+    <version>1.4.7</version>
     <modules>
 
         <module>base/main</module>
@@ -24,10 +29,12 @@
 
         <module>extension/papi</module>
         <module>extension/vault</module>
+        <module>extension/gh-checker</module>
 
         <module>collection/all</module>
         <module>collection/bom</module>
         <module>collection/common</module>
+        <module>base/storage</module>
 
     </modules>
 
@@ -35,6 +42,13 @@
     <description>轻松插件类库，简单快捷的通用Spigot插件基础类库。</description>
     <url>https://github.com/CarmJos/EasyPlugin</url>
 
+    <scm>
+        <connection>scm:git:git@github.com:CarmJos/EasyPlugin.git</connection>
+        <developerConnection>scm:git:git@github.com:CarmJos/EasyPlugin.git</developerConnection>
+        <url>https://github.com/CarmJos/EasyPlugin</url>
+        <tag>HEAD</tag>
+    </scm>
+
     <developers>
         <developer>
             <id>CarmJos</id>
@@ -63,11 +77,6 @@
 
     <distributionManagement>
         <downloadUrl>https://github.com/CarmJos/EasyPlugin/releases</downloadUrl>
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
-        </repository>
     </distributionManagement>
 
     <repositories>
@@ -120,6 +129,26 @@
 
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>me.clip</groupId>
+                <artifactId>placeholderapi</artifactId>
+                <version>2.10.9</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.MilkBowl</groupId>
+                <artifactId>VaultAPI</artifactId>
+                <version>1.7</version>
+            </dependency>
+            <dependency>
+                <groupId>cc.carm.lib</groupId>
+                <artifactId>githubreleases4j</artifactId>
+                <version>1.3.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -130,6 +159,39 @@
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${project.jdk.version}</source>
+                    <target>${project.jdk.version}</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -154,35 +216,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                        <encoding>UTF-8</encoding>
-                        <compilerArgument>-parameters</compilerArgument>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.0</version>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>jar-no-fork</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
@@ -221,4 +254,47 @@
     </build>
 
 
+    <profiles>
+
+        <profile>
+            <id>ossrh</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
+        <profile>
+            <id>github</id>
+            <distributionManagement>
+                <repository>
+                    <id>github</id>
+                    <name>GitHub Packages</name>
+                    <url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
+        <profile>
+            <id>local</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>localRepository</id>
+                    <url>file:${user.home}/local-deploy/</url>
+                </snapshotRepository>
+                <repository>
+                    <id>localRepository</id>
+                    <url>file:${user.home}/local-deploy/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
+    </profiles>
+
 </project>