feat(effect): 支持简单的传送粒子效果

- `[R]` 重写存储源初始化方法。
- `[F]` 修复服务器在未安装 Essentials 时出现无法加载插件的问题。

README.md

@@ -1,86 +1,125 @@
 ```text
- __  __         _______   _                       _   
+   __  ___       ______    __                  __ 
-|  \/  |       |__   __| | |                     | |  
+  /  |/  /__  __/_  __/__ / /__ ___  ___  ____/ /_
-| \  / | ___   ___| | ___| | ___ _ __   ___  _ __| |_ 
+ / /|_/ / _ \/ -_) / / -_) / -_) _ \/ _ \/ __/ __/
-| |\/| |/ _ \ / _ \ |/ _ \ |/ _ \ '_ \ / _ \| '__| __|
+/_/  /_/\___/\__/_/  \__/_/\__/ .__/\___/_/  \__/ 
-| |  | | (_) |  __/ |  __/ |  __/ |_) | (_) | |  | |_ 
+                             /_/                  
-|_|  |_|\___/ \___|_|\___|_|\___| .__/ \___/|_|   \__|
-                                | |                   
-                                |_|                   
 ```
 
 # MoeTeleport 喵喵传送
 
+[![CodeFactor](https://www.codefactor.io/repository/github/carm-outsource/MoeTeleport/badge?s=b76fec1f64726b5f19989aace6adb5f85fdab840)](https://www.codefactor.io/repository/github/carm-outsource/MoeTeleport)
+![CodeSize](https://img.shields.io/github/languages/code-size/carm-outsource/MoeTeleport)
+[![Download](https://img.shields.io/github/downloads/carm-outsource/MoeTeleport/total)](https://github.com/carm-outsource/MoeTeleport/releases)
+[![Java CI with Maven](https://github.com/carm-outsource/MoeTeleport/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/carm-outsource/MoeTeleport/actions/workflows/maven.yml)
+![Support](https://img.shields.io/badge/Minecraft-Java%201.13--Latest-blue)
+![](https://visitor-badge.glitch.me/badge?page_id=moeteleport.readme)
+
 开源的传送插件，包含数个功能，并根据用户需求持续更新添加新功能。
 
 项目代码符合开发规范，适合新手开发者学习Bukkit，制作属于自己的插件。
 
-本插件由 [璎珞服务器](https://www.yingluo.world/) 请求本人开发，经过授权后开源。
-
 ## 功能与优势
 
 ### 当前功能
 
 - 多种存储格式，按需选择。
-  - 支持 YAML、JSON 与 MySQL/MariaDB 存储方式
+    - 支持 YAML、JSON 与 MySQL/MariaDB 存储方式
-  - 支持直接调用 [EssentialsX](https://github.com/EssentialsX/Essentials) 数据，无缝切换
+    - 支持直接调用 [EssentialsX](https://github.com/EssentialsX/Essentials) / CMI 数据，无缝切换
-- 可点击的消息(如“点击同意”) 
+- 可点击的消息(如“点击同意”)
-  - 基于MineDown语法，可自定义配置
+    - 基于MineDown语法，可自定义配置
 - 玩家间的传送请求
-  - 支持指定处理某位玩家的请求
+    - 支持指定处理某位玩家的请求
-- 设置家与回家 (可以理解为私人地标)
+- 设置地标点
-  - 支持依照权限设定不同数量的家作为VIP附加内容
+  - 支持依照权限设定不同数量的地标点作为VIP附加内容
+- 设置家位置 (可以理解为私人地标)
+    - 支持依照权限设定不同数量的家作为VIP附加内容
 - 回到死亡地点、上一传送地点
 
 ### 优势
+
 - **轻量插件。** 适合小型服务器使用，配置简单方便。
 - **规范开发。** 插件架构符合开发规范，适合新手开发者学习。
-  - 自 [v3.0.0]() 版本开始采用了 EasyPlugin 开发，可能与其他主流插件结构有些不同。
+    - 自 [3.0.0]() 版本开始采用了 EasyPlugin 开发，可能与其他主流插件结构有些不同。
 - **持续维护。** 新功能需求均可提交，大概率在后续开发中支持。
-  - 功能需求请 [提交Issues](https://github.com/CarmJos/MoeTeleport/issues/new?assignees=&labels=enhancement&template=feature_issues.md&title=) ，不要在帖子中提交！
+  - 功能需求请 [提交Issues](https://github.com/CarmJos/MoeTeleport/issues/new?assignees=&labels=enhancement&template=feature_issues.md&title=)
+  ，不要在帖子中提交！
   - 提交与 “传送” 相关联的请求才大概率会被更新支持。
 
 ## [依赖](https://github.com/CarmJos/MoeTeleport/network/dependencies)
 
-- **[必须]** 插件本体基于 [Spigot-API](https://hub.spigotmc.org/stash/projects/SPIGOT) 、[BukkitAPI](http://bukkit.org/) 实现。
+- **[必须]** 插件本体基于 [Spigot-API](https://hub.spigotmc.org/stash/projects/SPIGOT) 、[BukkitAPI](http://bukkit.org/)
+  实现。
 - **[自带]** 消息格式基于 [MineDown](https://github.com/Phoenix616/MineDown) 实现。
-  - 所有 messages.yml 均支持 MineDown 语法。
+    - 所有 messages.yml 均支持 MineDown 语法。
 - **[推荐]** 变量部分基于 [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) 实现。
 
 详细依赖列表可见 [Dependencies](https://github.com/CarmJos/MoeTeleport/network/dependencies) 。
 
 ## [指令](src/main/resources/plugin.yml)
 
+以下指令的主指令为 `/MoeTeleport` 或 `/mt`。
+
+本插件所有指令支持配置“简化指令”，如允许玩家直接输入 `/back` 执行 `/MoeTeleport back`，详见 [配置文件](#配置) 相关内容。
+
 - 必须参数 `<参数>`
 - 可选参数 `[参数]`
 
 ```text
-# /MoeTeleport reload
+# reload
 @ 管理指令 (MoeTeleport.admin)
 - 重载插件配置文件。
 
-# /back
+# back
-- 返回上一个传送地点
+- 回到之前的传送位置。
 
-# /tpa <玩家> 
+----- [ 传送相关指令 ] -----
-- 请求传送到一个玩家身边。
-# /tpaHere <玩家>
-- 请求一个玩家传送到自己身边。
-# /tpAccept [玩家]
-- 同意一个请求，可以限定某个玩家。
-# /tpDeny [玩家]
-- 拒绝一个请求，可以限定某个玩家。
 
-# /home [name]
+# teleport to <目标玩家>
-- 返回设定的家
+- 请求传送到目标玩家的位置。
-- 不填name会返回第一个设置的家
+
+# teleport here <玩家>
+- 请求目标玩家传送到自己的位置。
+
+# teleport accept [玩家]
+- 同意一个传送请求(可具体指定玩家的请求)。
+
+# teleport deny [玩家]
+- 拒绝一个传送请求(可具体指定玩家的请求)。
+
+----- [ 家相关指令 ] -----
+
+# home to [家名]
+- 传送到指定的家。
+- 若不填写具体的家明则返回首个设置的家，
 - 若存在名为“home”的家则优先返回“home”。
-# /listHome
+
-- 列出所有家的位置
+# home list
-# /setHome [name]
+- 列出所有的家位置。
-- 设置家 (不填name默认为home)
+
-# /delHome <name>
+# home set [家名]
-- 删除家
+- 设定一个家的位置。
+- 若不填写家的名称则默认为“home”。
+
+# home delete [家名]
+- 删除一个家的位置。
+
+----- [ 地标相关指令 ] -----
+
+# warp to <地标名>
+- 传送到指定的地标点。
+
+# warp list
+- 列出当前所有的地标点。
+
+# warp set <地标名>
+- 设定一个地标点。
+- 若地标点已存在，且您是地标点的设立者(或是服务器管理员)，
+- 则会覆盖原有的地标点位置。
+
+# warp delete <地标名>
+- 删除一个自己设立的地标点。
+
 ```
 
 ## 配置
@@ -93,32 +132,24 @@
 
 支持 [MineDown 语法](https://wiki.phoenix616.dev/library:minedown:syntax)，详见源文件。
 
+## 使用统计
 
-
+[![bStats](https://bstats.org/signatures/bukkit/MoeTeleport.svg)](https://bstats.org/plugin/bukkit/MoeTeleport/14459)
-### 玩家数据配置文件 (data/\<UUID\>.yml)
-
-本插件采用 `YAML格式` 存储玩家数据。
-
-```yaml
-# 玩家的家位置记录
-# 格式为 world;x;y;z;yaw;pitch
-homes:
-  "name": "world;112.21;45;21.241245552;92.5512;-11"
-
-```
 
 ## 支持与捐赠
 
-若您觉得本插件做的不错，您可以捐赠支持我！
+若您觉得本插件做的不错，您可以捐赠支持我，感谢您成为开源项目的支持者！
 
-感谢您成为开源项目的支持者！
+由衷感谢以下支持本项目开发的朋友们：
-
+- 本插件由 [**璎珞**服务器](https://www.yingluo.world/) 委托本人开发，经过授权后开源。
-<img height=25% width=25% src="https://raw.githubusercontent.com/CarmJos/CarmJos/main/img/donate-code.jpg"  alt=""/>
+- 感谢 [**XingMC**(MagicMC服务器开发者)](https://www.mcbbs.net/?4816320) 为本插件提供后续开发的资金赞助。
 
 ## 开源协议
 
 本项目源码采用 [GNU General Public License v3.0](https://opensource.org/licenses/GPL-3.0) 开源协议。
-> ### 关于 GPL 协议
+<details>
+<summary>关于 GPL 协议</summary>
+
 > GNU General Public Licence (GPL) 有可能是开源界最常用的许可模式。GPL 保证了所有开发者的权利，同时为使用者提供了足够的复制，分发，修改的权利：
 >
 > #### 可自由复制
@@ -128,8 +159,11 @@ homes:
 > #### 可以用来盈利
 > 你可以在分发软件的时候收费，但你必须在收费前向你的客户提供该软件的 GNU GPL 许可协议，以便让他们知道，他们可以从别的渠道免费得到这份软件，以及你收费的理由。
 > #### 可自由修改
-> 如果你想添加或删除某个功能，没问题，如果你想在别的项目中使用部分代码，也没问题，唯一的要求是，使用了这段代码的项目也必须使用 GPL 协议。
+> 如果你想添加或删除某个功能，没问题，如果你想在别的项目中使用部分代码，也没问题，唯一的要求是，使用了这段代码的项目也必须使用
+> GPL 协议。
 >
-> 需要注意的是，分发的时候，需要明确提供源代码和二进制文件，另外，用于某些程序的某些协议有一些问题和限制，你可以看一下 @PierreJoye 写的 Practical Guide to GPL Compliance 一文。使用 GPL 协议，你必须在源代码代码中包含相应信息，以及协议本身。
+> 需要注意的是，分发的时候，需要明确提供源代码和二进制文件，另外，用于某些程序的某些协议有一些问题和限制，你可以看一下
+> @PierreJoye 写的 Practical Guide to GPL Compliance 一文。使用 GPL 协议，你必须在源代码代码中包含相应信息，以及协议本身。
 >
 > *以上文字来自 [五种开源协议GPL,LGPL,BSD,MIT,Apache](https://www.oschina.net/question/54100_9455) 。*
+</details>

pom.xml

@@ -5,17 +5,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
+        <project.jdk.version>8</project.jdk.version>
-        <maven.compiler.target>8</maven.compiler.target>
+        <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>
-        <easyplugin.version>1.3.9</easyplugin.version>
+
-        <easysql.version>0.3.8</easysql.version>
+        <deps.easyplugin.version>1.4.19</deps.easyplugin.version>
+        <deps.easysql.version>0.4.6</deps.easysql.version>
+        <deps.mineconfig.version>2.3.1</deps.mineconfig.version>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>moeteleport</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.0</version>
 
     <name>MoeTeleport</name>
     <description>喵喵传送，简单的传送、设置家的插件。</description>
@@ -23,12 +26,12 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/MoeTeleport/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/MoeTeleport/actions/workflows/maven.yml</url>
     </ciManagement>
 
     <developers>
@@ -91,7 +94,7 @@
     </repositories>
 
     <distributionManagement>
-        <downloadUrl>${project.url}/releases</downloadUrl>
+        <downloadUrl>https://github.com/CarmJos/MoeTeleport/releases</downloadUrl>
         <repository>
             <id>github</id>
             <name>GitHub Packages</name>
@@ -102,19 +105,36 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.spigotmc</groupId>
+            <groupId>cc.carm.lib</groupId>
-            <artifactId>spigot-api</artifactId>
+            <artifactId>mineconfiguration-bukkit</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>${deps.mineconfig.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>me.clip</groupId>
+            <groupId>cc.carm.lib</groupId>
-            <artifactId>placeholderapi</artifactId>
+            <artifactId>easyplugin-main</artifactId>
-            <version>2.10.9</version>
+            <version>${deps.easyplugin.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easyplugin-command</artifactId>
+            <version>${deps.easyplugin.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easyplugin-githubchecker</artifactId>
+            <version>${deps.easyplugin.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>net.essentialsx</groupId>
@@ -123,44 +143,60 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.Zrips</groupId>
+            <artifactId>CMI-API</artifactId>
+            <version>9.3.1.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/CMI-API9.3.1.2.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.Zrips</groupId>
+            <artifactId>CMILib</artifactId>
+            <version>1.2.4.5</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/CMILib1.2.4.5.jar</systemPath>
+        </dependency>
+
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easysql-beecp</artifactId>
-            <version>${easysql.version}</version>
+            <version>${deps.easysql.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>cc.carm.lib</groupId>
-            <artifactId>easyplugin-main</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.carm.lib</groupId>
-            <artifactId>easyplugin-configuration</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.carm.lib</groupId>
-            <artifactId>githubreleases4j</artifactId>
-            <version>1.3.1</version>
-            <scope>compile</scope>
-
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>de.themoep</groupId>
             <artifactId>minedown</artifactId>
             <version>1.7.1-SNAPSHOT</version>
             <scope>compile</scope>
-
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>xyz.xenondevs</groupId>
+            <artifactId>particle</artifactId>
+            <version>1.8.3</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.8.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
@@ -169,6 +205,13 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.10.9</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -179,27 +222,12 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
+            <version>23.0.0</version>
             <scope>provided</scope>
         </dependency>
 
     </dependencies>
 
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>cc.carm.lib</groupId>
-                <artifactId>easyplugin-bom</artifactId>
-                <version>${easyplugin.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -230,8 +258,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
+                    <source>${project.jdk.version}</source>
-                    <target>1.8</target>
+                    <target>${project.jdk.version}</target>
                     <encoding>UTF-8</encoding>
                     <compilerArgument>-parameters</compilerArgument>
                 </configuration>
@@ -280,6 +308,10 @@
                         </filter>
                     </filters>
                     <relocations>
+                        <relocation>
+                            <pattern>cc.carm.lib</pattern>
+                            <shadedPattern>cc.carm.plugin.moeteleport.lib</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>de.themoep.minedown</pattern>
                             <shadedPattern>cc.carm.plugin.moeteleport.lib.minedown</shadedPattern>
@@ -288,22 +320,14 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>cc.carm.plugin.moeteleport.lib.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>xyz.xenondevs.particle</pattern>
+                            <shadedPattern>cc.carm.plugin.moeteleport.lib.praticle</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>org.json</pattern>
                             <shadedPattern>cc.carm.plugin.moeteleport.lib.json</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>cc.carm.lib.easyplugin</pattern>
-                            <shadedPattern>cc.carm.plugin.ultradepository.lib.easyplugin</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>cc.carm.lib.easysql</pattern>
-                            <shadedPattern>cc.carm.plugin.moeteleport.lib.easysql</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>cc.carm.lib.githubreleases4j</pattern>
-                            <shadedPattern>cc.carm.plugin.moeteleport.lib.github</shadedPattern>
-                        </relocation>
                     </relocations>
                 </configuration>
             </plugin>

src/main/java/cc/carm/plugin/moeteleport/Main.java

@@ -1,63 +1,153 @@
 package cc.carm.plugin.moeteleport;
 
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.easyplugin.EasyPlugin;
-import cc.carm.lib.easyplugin.i18n.EasyPluginMessageProvider;
+import cc.carm.lib.easyplugin.updatechecker.GHUpdateChecker;
-import cc.carm.plugin.moeteleport.command.BackCommand;
+import cc.carm.lib.mineconfiguration.bukkit.MineConfiguration;
-import cc.carm.plugin.moeteleport.command.MoeTeleportCommand;
+import cc.carm.plugin.moeteleport.command.MainCommands;
-import cc.carm.plugin.moeteleport.command.completer.HomeNameCompleter;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
-import cc.carm.plugin.moeteleport.command.completer.PlayerNameCompleter;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
-import cc.carm.plugin.moeteleport.command.completer.TpRequestCompleter;
+import cc.carm.plugin.moeteleport.listener.TeleportListener;
-import cc.carm.plugin.moeteleport.command.completer.WarpNameCompleter;
-import cc.carm.plugin.moeteleport.command.home.HomeDelCommand;
-import cc.carm.plugin.moeteleport.command.home.HomeListCommand;
-import cc.carm.plugin.moeteleport.command.home.HomeSetCommand;
-import cc.carm.plugin.moeteleport.command.home.HomeTpCommand;
-import cc.carm.plugin.moeteleport.command.tpa.TpHandleCommand;
-import cc.carm.plugin.moeteleport.command.tpa.TpaCommand;
-import cc.carm.plugin.moeteleport.command.warp.*;
-import cc.carm.plugin.moeteleport.configuration.PluginConfig;
 import cc.carm.plugin.moeteleport.listener.UserListener;
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
+import cc.carm.plugin.moeteleport.manager.*;
-import cc.carm.plugin.moeteleport.manager.RequestManager;
-import cc.carm.plugin.moeteleport.manager.UserManager;
-import cc.carm.plugin.moeteleport.manager.WarpManager;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
 import cc.carm.plugin.moeteleport.storage.StorageMethod;
-import cc.carm.plugin.moeteleport.util.JarResourceUtils;
-import cc.carm.plugin.moeteleport.util.UpdateChecker;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
-import org.bukkit.event.Listener;
+import xyz.xenondevs.particle.utils.ReflectionUtils;
-
-import java.util.Arrays;
 
 public class Main extends EasyPlugin {
     private static Main instance;
-    private static DataStorage storage;
+
-    private WarpManager warpManager;
+    protected ConfigurationProvider<?> configProvider;
-    private UserManager userManager;
+    protected ConfigurationProvider<?> messageProvider;
-    private RequestManager requestManager;
+
+    protected DataStorage storage;
+    protected WarpManager warpManager;
+    protected UserManager userManager;
+    protected RequestManager requestManager;
+    protected TeleportManager teleportManager;
+    protected CommandManager commandManager;
 
     public Main() {
-        super(new EasyPluginMessageProvider.zh_CN());
         instance = this;
     }
 
-    /**
+    @Override
-     * 注册监听器
+    protected void load() {
-     *
+
-     * @param listener 监听器
+        log("加载插件配置文件...");
-     */
+        this.configProvider = MineConfiguration.from(this, "config.yml");
-    public static void regListener(Listener listener) {
+        this.configProvider.initialize(PluginConfig.class);
-        Bukkit.getPluginManager().registerEvents(listener, getInstance());
+
+        this.messageProvider = MineConfiguration.from(this, "messages.yml");
+        this.messageProvider.initialize(PluginMessages.class);
+
+    }
+
+    @Override
+    protected boolean initialize() {
+
+        log("初始化存储方式...");
+        StorageMethod storageMethod = StorageMethod.read(PluginConfig.STORAGE.METHOD.get());
+
+        try {
+            log("	正在使用 " + storageMethod.name() + " 进行数据存储");
+            storage = storageMethod.createStorage();
+            storage.initialize();
+        } catch (Exception ex) {
+            severe("初始化存储失败，请检查配置文件。");
+            setEnabled(false);
+            return false; // 初始化失败，不再继续加载
+        }
+
+        log("加载地标管理器...");
+        warpManager = new WarpManager();
+
+        log("加载用户管理器...");
+        this.userManager = new UserManager();
+        if (Bukkit.getOnlinePlayers().size() > 0) {
+            log("   加载现有用户数据...");
+            this.userManager.loadAll();
+        }
+
+        log("加载请求管理器...");
+        this.requestManager = new RequestManager(this);
+
+        log("加载传送管理器...");
+        this.teleportManager = new TeleportManager(this);
+
+        log("注册监听器...");
+        registerListener(new UserListener());
+        registerListener(new TeleportListener());
+
+        log("注册指令...");
+        registerCommand("MoeTeleport", new MainCommands(this));
+
+        try {
+            this.commandManager = new CommandManager(this);
+            if (PluginConfig.COMMAND.ENABLE.getNotNull()) {
+                PluginConfig.COMMAND.ALIAS.getNotNull().forEach(commandManager::register);
+            }
+        } catch (Exception e) {
+            log("注册简化指令失败： " + e.getMessage());
+            e.printStackTrace();
+        }
+
+        if (PluginConfig.METRICS.getNotNull()) {
+            log("启用统计数据...");
+            Metrics metrics = new Metrics(this, 14459);
+            metrics.addCustomChart(new SimplePie("storage_method", storageMethod::name));
+        }
+
+        if (PluginConfig.CHECK_UPDATE.getNotNull()) {
+            log("开始检查更新...");
+            getScheduler().runAsync(GHUpdateChecker.runner(this));
+        } else {
+            log("已禁用检查更新，跳过。");
+        }
+
+        log("初始化粒子库...");
+        ReflectionUtils.setPlugin(this);
+
+        return true;
+    }
+
+    @Override
+    protected void shutdown() {
+        log("清空简化指令...");
+        if (this.commandManager != null) {
+            this.commandManager.unregisterAll();
+        }
+
+        log("关闭所有请求...");
+        this.requestManager.shutdown();
+        this.teleportManager.shutdown();
+
+        log("保存用户数据...");
+        this.userManager.unloadAll(true);
+
+        log("保存地标数据...");
+        this.warpManager.saveWarps();
+
+        log("终止存储源...");
+        this.storage.shutdown();
+
+        log("卸载监听器...");
+        Bukkit.getServicesManager().unregisterAll(this);
+    }
+
+    @Override
+    public boolean isDebugging() {
+        return PluginConfig.DEBUG.getNotNull();
     }
 
     public static void info(String... messages) {
         getInstance().log(messages);
     }
 
-    public static void serve(String... messages) {
+    public static void severe(String... messages) {
         getInstance().error(messages);
     }
 
@@ -69,126 +159,11 @@ public class Main extends EasyPlugin {
         return instance;
     }
 
-    @Override
+    public ConfigurationProvider<?> getConfigProvider() {
-    protected boolean initialize() {
+        return configProvider;
-
-        info("加载配置文件...");
-        if (!ConfigManager.initConfig()) {
-            serve("配置文件初始化失败，请检查。");
-            setEnabled(false);
-            return false;
-        }
-
-        info("初始化存储方式...");
-        StorageMethod storageMethod = StorageMethod.read(PluginConfig.STORAGE_METHOD.get());
-        info("	正在使用 " + storageMethod.name() + " 进行数据存储");
-
-        storage = storageMethod.createStorage();
-        if (!storage.initialize()) {
-            serve("初始化存储失败，请检查配置文件。");
-            storage.shutdown();
-            setEnabled(false);
-            return false; // 初始化失败，不再继续加载
-        }
-
-        info("加载地标管理器...");
-        warpManager = new WarpManager();
-
-        info("加载用户管理器...");
-        this.userManager = new UserManager();
-        if (Bukkit.getOnlinePlayers().size() > 0) {
-            info("   加载现有用户数据...");
-            getUserManager().loadAll();
-        }
-
-        info("加载请求管理器...");
-        this.requestManager = new RequestManager(this);
-
-        info("注册监听器...");
-        regListener(new UserListener());
-
-        info("注册指令...");
-        registerCommand("MoeTeleport", new MoeTeleportCommand());
-
-        registerCommand("back", new BackCommand());
-
-        registerCommand("listHome", new HomeListCommand());
-        registerCommand("home", new HomeTpCommand(), new HomeNameCompleter());
-        registerCommand("setHome", new HomeSetCommand());
-        registerCommand("delHome", new HomeDelCommand(), new HomeNameCompleter());
-
-        registerCommand("tpa", new TpaCommand(), new PlayerNameCompleter());
-        registerCommand("tpaHere", new TpaCommand(), new PlayerNameCompleter());
-        registerCommand("tpAccept", new TpHandleCommand(), new TpRequestCompleter());
-        registerCommand("tpDeny", new TpHandleCommand(), new TpRequestCompleter());
-
-        registerCommand("listWarps", new WarpListCommand());
-        registerCommand("warpInfo", new WarpInfoCommand(), new WarpNameCompleter(false));
-        registerCommand("warp", new WarpTpCommand(), new WarpNameCompleter(false));
-        registerCommand("setWarp", new WarpSetCommand());
-        registerCommand("delWarp", new WarpDelCommand(), new WarpNameCompleter(true));
-
-        if (PluginConfig.METRICS.get()) {
-            info("启用统计数据...");
-            Metrics metrics = new Metrics(this, 14459);
-            metrics.addCustomChart(new SimplePie("storage_method", storageMethod::name));
-        }
-
-        if (PluginConfig.CHECK_UPDATE.get()) {
-            info("开始检查更新...");
-            UpdateChecker.checkUpdate();
-        } else {
-            info("已禁用检查更新，跳过。");
-        }
-
-        return true;
     }
 
-    @Override
+    public ConfigurationProvider<?> getMessageProvider() {
-    protected void shutdown() {
+        return messageProvider;
-        info("关闭所有请求...");
-        getRequestManager().shutdown();
-
-        info("保存用户数据...");
-        getUserManager().unloadAll(true);
-
-        info("保存地标数据...");
-        getWarpManager().saveWarps();
-
-        info("终止存储源...");
-        getStorage().shutdown();
-
-        info("卸载监听器...");
-        Bukkit.getServicesManager().unregisterAll(this);
     }
-
-    @Override
-    public boolean isDebugging() {
-        return PluginConfig.DEBUG.get();
-    }
-
-    public void outputInfo() {
-        String[] pluginInfo = JarResourceUtils.readResource(this.getResource("PLUGIN_INFO"));
-        if (pluginInfo != null) {
-            Arrays.stream(pluginInfo).forEach(Main::info);
-        }
-    }
-
-    protected DataStorage getStorage() {
-        return storage;
-    }
-
-    protected WarpManager getWarpManager() {
-        return getInstance().warpManager;
-    }
-
-    protected UserManager getUserManager() {
-        return getInstance().userManager;
-    }
-
-    protected RequestManager getRequestManager() {
-        return getInstance().requestManager;
-    }
-
-
 }

src/main/java/cc/carm/plugin/moeteleport/MoeTeleport.java

@@ -1,41 +1,41 @@
 package cc.carm.plugin.moeteleport;
 
 import cc.carm.plugin.moeteleport.manager.RequestManager;
+import cc.carm.plugin.moeteleport.manager.TeleportManager;
 import cc.carm.plugin.moeteleport.manager.UserManager;
 import cc.carm.plugin.moeteleport.manager.WarpManager;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
 import cc.carm.plugin.moeteleport.storage.StorageMethod;
 
-import java.util.function.Supplier;
-
 public class MoeTeleport {
 
-    public static void outputInfo() {
-        Main.getInstance().outputInfo();
-    }
-
     public static DataStorage getStorage() {
-        return Main.getInstance().getStorage();
+        return Main.getInstance().storage;
     }
 
     public static WarpManager getWarpManager() {
-        return Main.getInstance().getWarpManager();
+        return Main.getInstance().warpManager;
     }
 
     public static UserManager getUserManager() {
-        return Main.getInstance().getUserManager();
+        return Main.getInstance().userManager;
     }
 
     public static RequestManager getRequestManager() {
-        return Main.getInstance().getRequestManager();
+        return Main.getInstance().requestManager;
     }
 
-    public void registerCustomStorage(DataStorage storage) {
+    public static TeleportManager getTeleportManager() {
-        registerCustomStorage(() -> storage);
+        return Main.getInstance().teleportManager;
     }
 
-    public void registerCustomStorage(Supplier<DataStorage> storageSupplier) {
+
-        StorageMethod.CUSTOM.setStorageSupplier(storageSupplier);
+    public void setStorage(DataStorage storage) {
+        Main.getInstance().storage = storage;
+    }
+
+    public void registerCustomStorage(Class<? extends DataStorage> storageClazz) {
+        StorageMethod.CUSTOM.setStorageClazz(storageClazz);
     }
 
 }

src/main/java/cc/carm/plugin/moeteleport/command/BackCommand.java

@@ -1,28 +0,0 @@
-package cc.carm.plugin.moeteleport.command;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.manager.TeleportManager;
-import cc.carm.plugin.moeteleport.model.UserData;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class BackCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        if (data.getLastLocation() == null) {
-            PluginMessages.Back.NO_LAST_LOCATION.send(player);
-            return true;
-        }
-        TeleportManager.teleport(player, data.getLastLocation(), false);
-        return true;
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/MainCommands.java

@@ -0,0 +1,35 @@
+package cc.carm.plugin.moeteleport.command;
+
+import cc.carm.lib.easyplugin.command.CommandHandler;
+import cc.carm.plugin.moeteleport.command.parent.*;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class MainCommands extends CommandHandler {
+
+    public MainCommands(@NotNull JavaPlugin plugin) {
+        super(plugin);
+
+        registerHandler(new TeleportCommands(plugin, this, "teleport", "tp"));
+        registerHandler(new WarpCommands(plugin, this, "warp", "warps"));
+        registerHandler(new HomeCommands(plugin, this, "home", "homes"));
+
+        registerSubCommand(new BackCommand(this, "back"));
+        registerSubCommand(new ReloadCommand(this, "reload"));
+    }
+
+    @Override
+    public Void noArgs(CommandSender sender) {
+        PluginMessages.USAGE.COMMAND.send(sender);
+        return null;
+    }
+
+    @Override
+    public Void noPermission(CommandSender sender) {
+        PluginMessages.NO_PERMISSION.send(sender);
+        return null;
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/MoeTeleportCommand.java

@@ -1,23 +0,0 @@
-package cc.carm.plugin.moeteleport.command;
-
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-public class MoeTeleportCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command,
-                             @NotNull String s, @NotNull String[] args) {
-        if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
-            commandSender.sendMessage("Reloading config...");
-            ConfigManager.reload();
-            commandSender.sendMessage("Config reloaded.");
-            return true;
-        }
-        return false;
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/completer/HomeNameCompleter.java

@@ -1,31 +0,0 @@
-package cc.carm.plugin.moeteleport.command.completer;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.stream.Collectors;
-
-public class HomeNameCompleter implements TabCompleter {
-
-    @Nullable
-    @Override
-    public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return ImmutableList.of();
-        if (args.length == 1) {
-            return MoeTeleport.getUserManager().getData((Player) sender)
-                    .getHomeLocations().keySet().stream()
-                    .filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
-                    .limit(10).collect(Collectors.toList());
-        } else {
-            return ImmutableList.of();
-        }
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/completer/PlayerNameCompleter.java

@@ -1,47 +0,0 @@
-package cc.carm.plugin.moeteleport.command.completer;
-
-import com.google.common.collect.ImmutableList;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class PlayerNameCompleter implements TabCompleter {
-
-    List<Integer> indexes;
-
-    public PlayerNameCompleter() {
-        this(1);
-    }
-
-    public PlayerNameCompleter(Integer index) {
-        this(new Integer[]{index});
-    }
-
-    public PlayerNameCompleter(Integer[] indexes) {
-        this.indexes = Arrays.asList(indexes);
-    }
-
-    @Nullable
-    @Override
-    public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
-        if (args.length >= 1 && indexes.contains(args.length)) {
-            return Bukkit.getOnlinePlayers().stream()
-                    .map(HumanEntity::getName)
-                    .filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
-                    .limit(10).collect(Collectors.toList());
-        } else {
-            return ImmutableList.of();
-        }
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/completer/TpRequestCompleter.java

@@ -1,53 +0,0 @@
-package cc.carm.plugin.moeteleport.command.completer;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.model.UserData;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class TpRequestCompleter implements TabCompleter {
-
-    List<Integer> indexes;
-
-    public TpRequestCompleter() {
-        this(1);
-    }
-
-    public TpRequestCompleter(Integer index) {
-        this(new Integer[]{index});
-    }
-
-    public TpRequestCompleter(Integer[] indexes) {
-        this.indexes = Arrays.asList(indexes);
-    }
-
-    @Nullable
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return ImmutableList.of();
-        if (args.length >= 1 && indexes.contains(args.length)) {
-            UserData data = MoeTeleport.getUserManager().getData((Player) sender);
-            return data.getReceivedRequests().keySet().stream()
-                    .map(Bukkit::getPlayer).filter(Objects::nonNull).map(HumanEntity::getName)
-                    .filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
-                    .limit(10).collect(Collectors.toList());
-        } else {
-            return ImmutableList.of();
-        }
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/completer/WarpNameCompleter.java

@@ -1,48 +0,0 @@
-package cc.carm.plugin.moeteleport.command.completer;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class WarpNameCompleter implements TabCompleter {
-
-    boolean limitOwner;
-
-    public WarpNameCompleter(boolean limitOwner) {
-        this.limitOwner = limitOwner;
-    }
-
-    @Nullable
-    @Override
-    public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command,
-                                                @NotNull String alias, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return ImmutableList.of();
-        if (args.length == 1) {
-            if (limitOwner) {
-                Player player = (Player) sender;
-                return MoeTeleport.getWarpManager().listWarps().entrySet().stream()
-                        .filter(entry -> entry.getValue().getOwner() != null)
-                        .filter(entry -> entry.getValue().getOwner().equals(player.getUniqueId()))
-                        .map(Map.Entry::getKey)
-                        .filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
-                        .limit(10).collect(Collectors.toList());
-            } else {
-                return MoeTeleport.getWarpManager().listWarps().keySet().stream()
-                        .filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
-                        .limit(10).collect(Collectors.toList());
-            }
-        } else {
-            return ImmutableList.of();
-        }
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeCreateCommand.java

@@ -0,0 +1,65 @@
+package cc.carm.plugin.moeteleport.command.home;
+
+import cc.carm.lib.easyplugin.command.SimpleCompleter;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.HomeCommands;
+import cc.carm.plugin.moeteleport.command.sub.HomeSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class HomeCreateCommand extends HomeSubCommand {
+    public HomeCreateCommand(@NotNull HomeCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        UserData data = getData(player);
+        String homeName = args.length >= 1 ? args[0] : "home";
+
+        if (homeName.length() > 32) {  // 超过家的名字长度限定
+            PluginMessages.HOME.NAME_TOO_LONG.send(sender);
+            return null;
+        }
+
+        Map.Entry<String, DataLocation> lastHomeLocation = data.getHomeLocation(homeName);
+
+        int maxHome = MoeTeleport.getUserManager().getMaxHome(player);
+        if (data.getHomeLocations().size() >= maxHome && lastHomeLocation == null) {
+            PluginMessages.HOME.OVER_LIMIT.send(sender, maxHome);
+            return null;
+        }
+
+        data.setHomeLocation(homeName, player.getLocation());
+        if (lastHomeLocation != null) {
+            PluginMessages.HOME.OVERRIDE.send(sender, homeName, lastHomeLocation.getValue().toFlatString());
+        } else {
+            PluginMessages.HOME.SET.send(player, homeName);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return SimpleCompleter.text(args[args.length - 1], "home", sender.getName());
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeDelCommand.java

@@ -1,37 +0,0 @@
-package cc.carm.plugin.moeteleport.command.home;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-public class HomeDelCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        if (args.length < 1) return false;
-
-        Player player = (Player) sender;
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        String homeName = args[0];
-        Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
-        if (locationInfo == null) {
-            PluginMessages.Home.NOT_FOUND.send(player);
-        } else {
-            PluginMessages.Home.REMOVED.send(player, locationInfo.getKey(), locationInfo.getValue().toFlatString());
-            data.delHomeLocation(homeName);
-        }
-        return true;
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeDeleteCommand.java

@@ -0,0 +1,54 @@
+package cc.carm.plugin.moeteleport.command.home;
+
+import cc.carm.plugin.moeteleport.command.parent.HomeCommands;
+import cc.carm.plugin.moeteleport.command.sub.HomeSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class HomeDeleteCommand extends HomeSubCommand {
+
+    public HomeDeleteCommand(@NotNull HomeCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        if (args.length < 1) return getParent().noArgs(sender);
+
+        Player player = (Player) sender;
+        UserData data = getData(player);
+        String homeName = args[0];
+
+        Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
+        if (locationInfo == null) {
+            PluginMessages.HOME.NOT_FOUND.send(player);
+        } else {
+            PluginMessages.HOME.REMOVED.send(player, locationInfo.getKey(), locationInfo.getValue().toFlatString());
+            data.delHomeLocation(homeName);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listHomes(sender, args[args.length - 1]);
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeListCommand.java

@@ -1,25 +1,37 @@
 package cc.carm.plugin.moeteleport.command.home;
 
-import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.HomeCommands;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
+import cc.carm.plugin.moeteleport.command.sub.HomeSubCommand;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
-import org.bukkit.command.Command;
+import cc.carm.plugin.moeteleport.storage.UserData;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
-public class HomeListCommand implements CommandExecutor {
+public class HomeListCommand extends HomeSubCommand {
 
-    @Override
+    public HomeListCommand(@NotNull HomeCommands parent, String name, String... aliases) {
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
+        super(parent, name, aliases);
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        PluginMessages.Home.List.HEADER.send(player);
-        data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.List.OBJECT.send(player, name, loc.toFlatString()));
-        return true;
     }
 
-}
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        UserData data = getData(player);
+
+        if (data.getHomeLocations().isEmpty()) {
+            PluginMessages.HOME.EMPTY.send(sender);
+            return null;
+        }
+
+        PluginMessages.HOME.LIST.HEADER.send(player);
+        data.getHomeLocations().forEach((name, loc) -> PluginMessages.HOME.LIST.OBJECT.send(player, name, loc.toFlatString()));
+        return null;
+    }
+}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeSetCommand.java

@@ -1,49 +0,0 @@
-package cc.carm.plugin.moeteleport.command.home;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-public class HomeSetCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        String homeName = args.length >= 1 ? args[0] : "home";
-
-        if (homeName.length() > 32) {
-            // 限定家的名字长度
-            PluginMessages.Home.NAME_TOO_LONG.send(sender);
-            return true;
-        }
-        Map.Entry<String, DataLocation> lastHomeLocation = data.getHomeLocation(homeName);
-
-        int maxHome = MoeTeleport.getUserManager().getMaxHome(player);
-        if (data.getHomeLocations().size() >= maxHome && lastHomeLocation == null) {
-            PluginMessages.Home.OVER_LIMIT.send(sender, maxHome);
-            return true;
-        }
-
-        data.setHomeLocation(homeName, player.getLocation());
-        if (lastHomeLocation != null) {
-            PluginMessages.Home.OVERRIDE.send(sender, homeName, lastHomeLocation.getValue().toFlatString());
-        } else {
-            PluginMessages.Home.SET.send(player, homeName);
-        }
-
-        return true;
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeTeleportCommand.java

@@ -0,0 +1,52 @@
+package cc.carm.plugin.moeteleport.command.home;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.HomeCommands;
+import cc.carm.plugin.moeteleport.command.sub.HomeSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class HomeTeleportCommand extends HomeSubCommand {
+
+    public HomeTeleportCommand(@NotNull HomeCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        UserData data = getData(player);
+        String homeName = args.length >= 1 ? args[0] : null;
+
+        Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
+        if (locationInfo == null) {
+            PluginMessages.HOME.NOT_FOUND.send(player);
+        } else {
+            MoeTeleport.getTeleportManager().queueTeleport(player, locationInfo.getValue());
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listHomes(sender, args[args.length - 1]);
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/home/HomeTpCommand.java

@@ -1,35 +0,0 @@
-package cc.carm.plugin.moeteleport.command.home;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
-import cc.carm.plugin.moeteleport.manager.TeleportManager;
-import cc.carm.plugin.moeteleport.model.UserData;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-public class HomeTpCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        String homeName = args.length >= 1 ? args[0] : null;
-        Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
-        if (locationInfo == null) {
-            PluginMessages.Home.NOT_FOUND.send(player);
-        } else {
-            TeleportManager.teleport(player, locationInfo.getValue(), false);
-        }
-        return true;
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/parent/BackCommand.java

@@ -0,0 +1,42 @@
+package cc.carm.plugin.moeteleport.command.parent;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.MainCommands;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class BackCommand extends SubCommand<MainCommands> {
+
+    public BackCommand(@NotNull MainCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        if (!PluginConfig.BACK.ENABLE.getNotNull()) {
+            PluginMessages.NOT_ENABLED.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        UserData data = MoeTeleport.getUserManager().getData(player);
+        if (data.getLastLocation() == null) {
+            PluginMessages.BACK.NO_LAST_LOCATION.send(player);
+            return null;
+        }
+        MoeTeleport.getTeleportManager().queueTeleport(player, data.getLastLocation());
+        return null;
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/parent/HomeCommands.java

@@ -0,0 +1,53 @@
+package cc.carm.plugin.moeteleport.command.parent;
+
+import cc.carm.lib.easyplugin.command.CommandHandler;
+import cc.carm.plugin.moeteleport.command.MainCommands;
+import cc.carm.plugin.moeteleport.command.home.HomeCreateCommand;
+import cc.carm.plugin.moeteleport.command.home.HomeDeleteCommand;
+import cc.carm.plugin.moeteleport.command.home.HomeListCommand;
+import cc.carm.plugin.moeteleport.command.home.HomeTeleportCommand;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class HomeCommands extends CommandHandler {
+
+    protected final @NotNull MainCommands main;
+
+    public HomeCommands(@NotNull JavaPlugin plugin, @NotNull MainCommands main,
+                        @NotNull String cmd, @NotNull String... aliases) {
+        super(plugin, cmd, aliases);
+        this.main = main;
+
+        registerSubCommand(new HomeTeleportCommand(this, "to", "teleport", "tp"));
+        registerSubCommand(new HomeListCommand(this, "list", "ls"));
+        registerSubCommand(new HomeCreateCommand(this, "set", "create"));
+        registerSubCommand(new HomeDeleteCommand(this, "delete", "remove", "del"));
+    }
+
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (!PluginConfig.HOMES.ENABLE.getNotNull()) {
+            PluginMessages.NOT_ENABLED.send(sender);
+            return true;
+        }
+
+        return super.onCommand(sender, command, label, args);
+    }
+
+    @Override
+    public Void noArgs(CommandSender sender) {
+        PluginMessages.USAGE.HOMES.send(sender);
+        return null;
+    }
+
+    @Override
+    public Void noPermission(CommandSender sender) {
+        return main.noPermission(sender);
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/parent/ReloadCommand.java

@@ -0,0 +1,41 @@
+package cc.carm.plugin.moeteleport.command.parent;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.command.MainCommands;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class ReloadCommand extends SubCommand<MainCommands> {
+
+    public ReloadCommand(@NotNull MainCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+
+        PluginMessages.RELOAD.START.send(sender);
+        long s1 = System.currentTimeMillis();
+
+        try {
+            Main.getInstance().getConfigProvider().reload();
+            Main.getInstance().getMessageProvider().reload();
+
+            PluginMessages.RELOAD.COMPLETE.send(sender, System.currentTimeMillis() - s1);
+        } catch (Exception ex) {
+            PluginMessages.RELOAD.ERROR.send(sender);
+            ex.printStackTrace();
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean hasPermission(CommandSender sender) {
+        return sender.hasPermission("moeteleport.reload");
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/parent/TeleportCommands.java

@@ -0,0 +1,41 @@
+package cc.carm.plugin.moeteleport.command.parent;
+
+import cc.carm.lib.easyplugin.command.CommandHandler;
+import cc.carm.plugin.moeteleport.command.MainCommands;
+import cc.carm.plugin.moeteleport.command.teleport.TeleportCancelCommand;
+import cc.carm.plugin.moeteleport.command.teleport.TeleportHandleCommand;
+import cc.carm.plugin.moeteleport.command.teleport.TeleportRequestCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class TeleportCommands extends CommandHandler {
+
+    protected final @NotNull MainCommands main;
+
+    public TeleportCommands(@NotNull JavaPlugin plugin, @NotNull MainCommands main,
+                            @NotNull String cmd, @NotNull String... aliases) {
+        super(plugin, cmd, aliases);
+        this.main = main;
+
+        registerSubCommand(new TeleportRequestCommand(this, TeleportRequest.Type.TPA_TO, "to"));
+        registerSubCommand(new TeleportRequestCommand(this, TeleportRequest.Type.TPA_HERE, "here"));
+        registerSubCommand(new TeleportHandleCommand(this, true, "cancel"));
+        registerSubCommand(new TeleportHandleCommand(this, false, "deny", "refuse"));
+        registerSubCommand(new TeleportCancelCommand(this, "cancel"));
+    }
+
+    @Override
+    public Void noArgs(CommandSender sender) {
+        PluginMessages.USAGE.TELEPORT.send(sender);
+        return null;
+    }
+
+    @Override
+    public Void noPermission(CommandSender sender) {
+        return main.noPermission(sender);
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/parent/WarpCommands.java

@@ -0,0 +1,51 @@
+package cc.carm.plugin.moeteleport.command.parent;
+
+import cc.carm.lib.easyplugin.command.CommandHandler;
+import cc.carm.plugin.moeteleport.command.MainCommands;
+import cc.carm.plugin.moeteleport.command.warp.*;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class WarpCommands extends CommandHandler {
+
+    protected final @NotNull MainCommands main;
+
+    public WarpCommands(@NotNull JavaPlugin plugin, @NotNull MainCommands main,
+                        @NotNull String cmd, @NotNull String... aliases) {
+        super(plugin, cmd, aliases);
+        this.main = main;
+
+        registerSubCommand(new WarpTeleportCommand(this, "to", "teleport", "tp"));
+        registerSubCommand(new WarpListCommand(this, "list", "ls"));
+        registerSubCommand(new WarpInfoCommand(this, "info", "i"));
+        registerSubCommand(new WarpCreateCommand(this, "set", "create"));
+        registerSubCommand(new WarpDeleteCommand(this, "delete", "remove", "del"));
+
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (!PluginConfig.WARPS.ENABLE.getNotNull()) {
+            PluginMessages.NOT_ENABLED.send(sender);
+            return true;
+        }
+
+        return super.onCommand(sender, command, label, args);
+    }
+
+    @Override
+    public Void noArgs(CommandSender sender) {
+        PluginMessages.USAGE.WARPS.send(sender);
+        return null;
+    }
+
+    @Override
+    public Void noPermission(CommandSender sender) {
+        return main.noPermission(sender);
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/sub/HomeSubCommand.java

@@ -0,0 +1,40 @@
+package cc.carm.plugin.moeteleport.command.sub;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.HomeCommands;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public abstract class HomeSubCommand extends SubCommand<HomeCommands> {
+    public HomeSubCommand(@NotNull HomeCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    public @NotNull UserData getData(Player player) {
+        return MoeTeleport.getUserManager().getData(player);
+    }
+
+    public @Nullable UserData getData(UUID player) {
+        return MoeTeleport.getUserManager().getData(player);
+    }
+
+    public @NotNull List<String> listHomes(CommandSender sender, String input) {
+        if (!(sender instanceof Player)) return Collections.emptyList();
+
+        return MoeTeleport.getUserManager().getData((Player) sender)
+                .getHomeLocations().keySet().stream()
+                .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
+                .limit(10).collect(Collectors.toList());
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/sub/TeleportSubCommand.java

@@ -0,0 +1,45 @@
+package cc.carm.plugin.moeteleport.command.sub;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.TeleportCommands;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public abstract class TeleportSubCommand extends SubCommand<TeleportCommands> {
+
+    public TeleportSubCommand(@NotNull TeleportCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    public @NotNull UserData getData(Player player) {
+        return MoeTeleport.getUserManager().getData(player);
+    }
+
+    public @Nullable UserData getData(UUID player) {
+        return MoeTeleport.getUserManager().getData(player);
+    }
+
+    public @NotNull List<String> listRequests(CommandSender sender, String input) {
+        if (!(sender instanceof Player)) return Collections.emptyList();
+        return getReceivedRequests((Player) sender).keySet().stream()
+                .map(Bukkit::getPlayer).filter(Objects::nonNull).map(HumanEntity::getName)
+                .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
+                .limit(10).collect(Collectors.toList());
+    }
+
+    public @NotNull Map<UUID, TeleportRequest> getReceivedRequests(Player player) {
+        return MoeTeleport.getRequestManager().getUserReceivedRequests(player.getUniqueId());
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/sub/WarpSubCommand.java

@@ -0,0 +1,53 @@
+package cc.carm.plugin.moeteleport.command.sub;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.WarpCommands;
+import cc.carm.plugin.moeteleport.manager.WarpManager;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public abstract class WarpSubCommand extends SubCommand<WarpCommands> {
+    public WarpSubCommand(@NotNull WarpCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    public WarpManager getManager() {
+        return MoeTeleport.getWarpManager();
+    }
+
+    @NotNull
+    @Unmodifiable
+    public Map<String, WarpInfo> listWarps() {
+        return getManager().listWarps();
+    }
+
+    public WarpInfo getWarp(@NotNull String name) {
+        return getManager().getWarp(name);
+    }
+
+    public List<String> listWarpNames(CommandSender sender, String input, boolean limitOwner) {
+        if (limitOwner && sender instanceof Player) {
+            Player player = (Player) sender;
+            return listWarps().entrySet().stream()
+                    .filter(entry -> entry.getValue().getOwner() != null)
+                    .filter(entry -> entry.getValue().getOwner().equals(player.getUniqueId()))
+                    .map(Map.Entry::getKey)
+                    .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
+                    .limit(10).collect(Collectors.toList());
+        } else {
+            return listWarps().keySet().stream()
+                    .filter(s -> StringUtil.startsWithIgnoreCase(s, input))
+                    .limit(10).collect(Collectors.toList());
+        }
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/teleport/TeleportCancelCommand.java

@@ -0,0 +1,48 @@
+package cc.carm.plugin.moeteleport.command.teleport;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.TeleportCommands;
+import cc.carm.plugin.moeteleport.command.sub.TeleportSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TeleportCancelCommand extends TeleportSubCommand {
+
+    public TeleportCancelCommand(@NotNull TeleportCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+
+        TeleportRequest request = MoeTeleport.getRequestManager().getRequest(player.getUniqueId());
+        if (request == null) {
+            PluginMessages.REQUESTS.EMPTY_REQUESTS.send(player);
+            return null;
+        }
+
+        MoeTeleport.getRequestManager().cancelRequest(request);
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listRequests(sender, args[args.length - 1]);
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/teleport/TeleportHandleCommand.java

@@ -0,0 +1,85 @@
+package cc.carm.plugin.moeteleport.command.teleport;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.TeleportCommands;
+import cc.carm.plugin.moeteleport.command.sub.TeleportSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+public class TeleportHandleCommand extends TeleportSubCommand {
+
+    protected final boolean accept;
+
+    public TeleportHandleCommand(@NotNull TeleportCommands parent, boolean accept, String name, String... aliases) {
+        super(parent, name, aliases);
+        this.accept = accept;
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        UserData data = MoeTeleport.getUserManager().getData(player);
+
+        Map<UUID, TeleportRequest> receivedRequests = getReceivedRequests(player);
+        if (receivedRequests.isEmpty()) {
+            PluginMessages.REQUESTS.EMPTY_REQUESTS.send(player);
+            return null;
+        }
+
+        String targetName = args.length > 0 ? args[0] : null;
+        data.setEnableAutoSelect(false);
+
+        if (targetName != null) {
+            Player target = Bukkit.getPlayer(targetName);
+            TeleportRequest request = target == null ? null : receivedRequests.get(target.getUniqueId());
+
+            if (request == null) {
+                PluginMessages.REQUESTS.NO_REQUEST_FROM.send(player, target == null ? targetName : target.getName());
+            } else {
+                handle(request); // 交给Manager处理
+            }
+        } else {
+            if (receivedRequests.size() == 1 || data.isEnableAutoSelect()) {
+                receivedRequests.values().stream()
+                        .min(Comparator.comparingLong(TeleportRequest::getActiveMillis))
+                        .ifPresent(this::handle);
+            } else {
+                PluginMessages.REQUESTS.MULTI.send(player,
+                        receivedRequests.size(),
+                        "moeteleport teleport " + (accept ? "tpAccept" : "tpDeny").toLowerCase()
+                );
+                data.setEnableAutoSelect(true);
+            }
+        }
+        return null;
+    }
+
+    private void handle(TeleportRequest request) {
+        if (accept) {
+            MoeTeleport.getRequestManager().acceptRequest(request);
+        } else {
+            MoeTeleport.getRequestManager().denyRequest(request);
+        }
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listRequests(sender, args[args.length - 1]);
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/teleport/TeleportRandomCommand.java

@@ -0,0 +1,20 @@
+package cc.carm.plugin.moeteleport.command.teleport;
+
+import cc.carm.plugin.moeteleport.command.parent.TeleportCommands;
+import cc.carm.plugin.moeteleport.command.sub.TeleportSubCommand;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class TeleportRandomCommand extends TeleportSubCommand {
+
+    public TeleportRandomCommand(@NotNull TeleportCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        return null;
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/teleport/TeleportRequestCommand.java

@@ -0,0 +1,73 @@
+package cc.carm.plugin.moeteleport.command.teleport;
+
+import cc.carm.lib.easyplugin.command.SimpleCompleter;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.TeleportCommands;
+import cc.carm.plugin.moeteleport.command.sub.TeleportSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TeleportRequestCommand extends TeleportSubCommand {
+
+    private final @NotNull TeleportRequest.Type type;
+
+    public TeleportRequestCommand(@NotNull TeleportCommands parent,
+                                  @NotNull TeleportRequest.Type type,
+                                  String name, String... aliases) {
+        super(parent, name, aliases);
+        this.type = type;
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        if (args.length < 1) return getParent().noArgs(sender);
+
+        Player player = (Player) sender;
+        Player target = Bukkit.getPlayer(args[0]);
+        if (target == null) {
+            PluginMessages.NOT_ONLINE.send(player);
+            return null;
+        }
+
+        if (player == target) {
+            // fix #5 - 玩家给自己发送传送请求
+            PluginMessages.REQUESTS.SELF.send(player);
+            return null;
+        }
+
+        TeleportRequest sent = MoeTeleport.getRequestManager().getRequest(player.getUniqueId());
+        if (sent != null) {
+            PluginMessages.REQUESTS.DUPLICATE.send(sender, target.getName(), sent.getRemainSeconds());
+            return null;
+        }
+
+        MoeTeleport.getRequestManager().sendRequest(player, target, type);
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return SimpleCompleter.objects(
+                    args[args.length - 1], 15,
+                    Bukkit.getOnlinePlayers().stream()
+                            .map(Player::getName)
+                            .filter(s -> !s.equalsIgnoreCase(sender.getName()))
+            );
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/tpa/TpHandleCommand.java

@@ -1,59 +0,0 @@
-package cc.carm.plugin.moeteleport.command.tpa;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.model.TeleportRequest;
-import cc.carm.plugin.moeteleport.model.UserData;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Comparator;
-
-public class TpHandleCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        if (data.getReceivedRequests().isEmpty()) {
-            PluginMessages.Requests.EMPTY_REQUESTS.send(player);
-            return true;
-        }
-        String targetName = args.length > 0 ? args[0] : null;
-        boolean accept = command.getName().equalsIgnoreCase("tpAccept");
-        data.setEnableAutoSelect(false);
-        if (targetName != null) {
-            Player target = Bukkit.getPlayer(targetName);
-            if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
-                PluginMessages.Requests.NO_REQUEST_FROM.send(player, target == null ? targetName : target.getName());
-            } else {
-                handle(data.getReceivedRequests().get(target.getUniqueId()), accept); // 交给Manager处理
-            }
-        } else {
-            if (data.getReceivedRequests().size() == 1 || data.isEnableAutoSelect()) {
-                data.getReceivedRequests().values().stream()
-                        .min(Comparator.comparingLong(TeleportRequest::getActiveTime))
-                        .ifPresent(request -> handle(request, accept));
-            } else {
-                PluginMessages.Requests.MULTI.send(player, data.getReceivedRequests().size(), command.getName());
-                data.setEnableAutoSelect(true);
-            }
-        }
-        return true;
-    }
-
-    private void handle(TeleportRequest request, boolean accept) {
-        if (accept) {
-            MoeTeleport.getRequestManager().acceptRequest(request);
-        } else {
-            MoeTeleport.getRequestManager().denyRequest(request);
-        }
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/tpa/TpaCommand.java

@@ -1,46 +0,0 @@
-package cc.carm.plugin.moeteleport.command.tpa;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.model.TeleportRequest;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class TpaCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player) || args.length < 1) return false;
-        Player player = (Player) sender;
-        Player target = Bukkit.getPlayer(args[0]);
-        if (target == null) {
-            PluginMessages.NOT_ONLINE.send(player);
-            return true;
-        }
-
-        if (player == target) {
-            // fix #5 - 玩家给自己发送传送请求
-            PluginMessages.Requests.SELF.send(player);
-            return true;
-        }
-
-        TeleportRequest request = MoeTeleport.getUserManager().getData(target).getReceivedRequests().get(player.getUniqueId());
-        if (request != null) {
-            PluginMessages.Requests.DUPLICATE.send(sender, target.getName(), request.getRemainSeconds());
-            return true;
-        }
-        if (command.getName().equalsIgnoreCase("tpa")) {
-            MoeTeleport.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
-        } else {
-            MoeTeleport.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
-        }
-
-        return true;
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpCreateCommand.java

@@ -0,0 +1,71 @@
+package cc.carm.plugin.moeteleport.command.warp;
+
+import cc.carm.lib.easyplugin.command.SimpleCompleter;
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.WarpCommands;
+import cc.carm.plugin.moeteleport.command.sub.WarpSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+public class WarpCreateCommand extends WarpSubCommand {
+
+    public WarpCreateCommand(@NotNull WarpCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        String warpName = args.length >= 1 ? args[0] : player.getName();
+
+        if (warpName.length() > 16) {   // 超过地标的名字长度限定
+            PluginMessages.WARP.NAME_TOO_LONG.send(sender);
+            return null;
+        }
+
+        WarpInfo info = getWarp(warpName);
+
+        if (!player.isOp() && !player.hasPermission("MoeTeleport.admin")) {
+            if (info != null && (info.getOwner() == null || !info.getOwner().equals(player.getUniqueId()))) {
+                PluginMessages.WARP.NOT_OWNER.send(sender, warpName);
+                return null;
+            }
+
+            int maxWarp = MoeTeleport.getUserManager().getMaxWarps(player);
+            long currentUsed = MoeTeleport.getUserManager().countUserWarps(player.getUniqueId());
+            if (currentUsed >= maxWarp && info == null) {
+                PluginMessages.WARP.OVER_LIMIT.send(sender, maxWarp);
+                return null;
+            }
+        }
+
+        getManager().setWarpAsync(warpName, player.getUniqueId(), player.getLocation());
+        if (info != null) {
+            PluginMessages.WARP.OVERRIDE.send(sender, warpName, info.getLocation().toFlatString());
+        } else {
+            PluginMessages.WARP.SET.send(sender, warpName);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return SimpleCompleter.text(args[args.length - 1], sender.getName());
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpDelCommand.java

@@ -1,40 +0,0 @@
-package cc.carm.plugin.moeteleport.command.warp;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.model.WarpInfo;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class WarpDelCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        if (args.length < 1) return false;
-        String warpName = args[0];
-        Player player = (Player) sender;
-
-        WarpInfo info = MoeTeleport.getWarpManager().getWarp(warpName);
-        if (info == null) {
-            PluginMessages.Warp.NOT_FOUND.send(player);
-            return true;
-        }
-
-        if (!player.isOp() && !player.hasPermission("MoeTeleport.admin")) {
-            if (info.getOwner() == null || !info.getOwner().equals(player.getUniqueId())) {
-                PluginMessages.Warp.NOT_OWNER.send(player);
-                return true;
-            }
-        }
-
-        MoeTeleport.getWarpManager().delWarpAsync(warpName);
-        PluginMessages.Warp.REMOVED.send(player, warpName, info.getLocation().toFlatString());
-
-        return true;
-    }
-}

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpDeleteCommand.java

@@ -0,0 +1,55 @@
+package cc.carm.plugin.moeteleport.command.warp;
+
+import cc.carm.plugin.moeteleport.command.parent.WarpCommands;
+import cc.carm.plugin.moeteleport.command.sub.WarpSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+public class WarpDeleteCommand extends WarpSubCommand {
+
+    public WarpDeleteCommand(@NotNull WarpCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (args.length < 1) return getParent().noArgs(sender);
+
+        String warpName = args[0];
+
+        WarpInfo info = getWarp(warpName);
+        if (info == null) {
+            PluginMessages.WARP.NOT_FOUND.send(sender, warpName);
+            return null;
+        }
+
+        if (sender instanceof Player && !sender.isOp()
+                && !sender.hasPermission("MoeTeleport.admin")) {
+            Player player = (Player) sender;
+            if (info.getOwner() == null || !info.getOwner().equals(player.getUniqueId())) {
+                PluginMessages.WARP.NOT_OWNER.send(sender);
+                return null;
+            }
+        }
+
+        getManager().delWarpAsync(warpName);
+        PluginMessages.WARP.REMOVED.send(sender, warpName, info.getLocation().toFlatString());
+
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listWarpNames(sender, args[args.length - 1], true);
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpInfoCommand.java

@@ -1,35 +1,47 @@
 package cc.carm.plugin.moeteleport.command.warp;
 
-import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.WarpCommands;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
+import cc.carm.plugin.moeteleport.command.sub.WarpSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
-public class WarpInfoCommand implements CommandExecutor {
+import java.util.Collections;
+import java.util.List;
+
+public class WarpInfoCommand extends WarpSubCommand {
+
+    public WarpInfoCommand(@NotNull WarpCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
         String warpName = args[0];
-        Player player = (Player) sender;
 
-        WarpInfo info = MoeTeleport.getWarpManager().getWarp(warpName);
+        WarpInfo info = getWarp(warpName);
         if (info == null) {
-            PluginMessages.Warp.NOT_FOUND.send(player);
+            PluginMessages.WARP.NOT_FOUND.send(sender, warpName);
-            return true;
+            return null;
         }
 
         String ownerName = info.getOwnerName();
         if (ownerName != null) {
-            PluginMessages.Warp.INFO_FULL.send(player, warpName, ownerName, info.getLocation().toFlatString());
+            PluginMessages.WARP.INFO_FULL.send(sender, warpName, ownerName, info.getLocation().toFlatString());
         } else {
-            PluginMessages.Warp.INFO_LOCATION.send(player, warpName, info.getLocation().toFlatString());
+            PluginMessages.WARP.INFO_LOCATION.send(sender, warpName, info.getLocation().toFlatString());
         }
-        return true;
+
+        return null;
     }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listWarpNames(sender, args[args.length - 1], false);
+        } else return Collections.emptyList();
+    }
+
 }

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpListCommand.java

@@ -1,28 +1,31 @@
 package cc.carm.plugin.moeteleport.command.warp;
 
-import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.lib.easyplugin.command.SimpleCompleter;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
+import cc.carm.plugin.moeteleport.command.parent.WarpCommands;
+import cc.carm.plugin.moeteleport.command.sub.WarpSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
 
-public class WarpListCommand implements CommandExecutor {
+public class WarpListCommand extends WarpSubCommand {
+
+    public WarpListCommand(@NotNull WarpCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
-                             @NotNull String label, @NotNull String[] args) {
+        ArrayList<WarpInfo> warps = new ArrayList<>(listWarps().values());
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-
-        ArrayList<WarpInfo> warps = new ArrayList<>(MoeTeleport.getWarpManager().listWarps().values());
         if (warps.isEmpty()) {
-            PluginMessages.Warp.EMPTY.send(player);
+            PluginMessages.WARP.EMPTY.send(sender);
-            return true;
+            return null;
         }
 
         String pageString = args.length > 0 ? args[0] : null;
@@ -40,19 +43,26 @@ public class WarpListCommand implements CommandExecutor {
         int startIndex = Math.max(0, (currentPage - 1) * 10);
         int endIndex = Math.min(warps.size(), startIndex + 9);
 
-        PluginMessages.Warp.List.HEADER.send(player, currentPage, maxPage);
+        PluginMessages.WARP.LIST.HEADER.send(sender, currentPage, maxPage);
         for (int i = startIndex; i < endIndex; i++) {
             WarpInfo info = warps.get(i);
             String ownerName = info.getOwnerName();
             if (ownerName == null) {
-                PluginMessages.Warp.List.OBJECT_NO_OWNER.send(player, info.getName(), info.getLocation().toFlatString());
+                PluginMessages.WARP.LIST.OBJECT_NO_OWNER.send(sender, info.getName(), info.getLocation().toFlatString());
             } else {
-                PluginMessages.Warp.List.OBJECT.send(player, info.getName(), ownerName, info.getLocation().toFlatString());
+                PluginMessages.WARP.LIST.OBJECT.send(sender, info.getName(), ownerName, info.getLocation().toFlatString());
             }
         }
 
-        return true;
+        return null;
     }
 
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            int maxPage = (int) Math.ceil(listWarps().size() / 10.0);
+            return SimpleCompleter.objects(args[args.length - 1], IntStream.rangeClosed(1, maxPage).boxed());
+        } else return Collections.emptyList();
+    }
 
 }

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpSetCommand.java

@@ -1,51 +0,0 @@
-package cc.carm.plugin.moeteleport.command.warp;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.model.WarpInfo;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class WarpSetCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        Player player = (Player) sender;
-        String warpName = args.length >= 1 ? args[0] : player.getName();
-
-        if (warpName.length() > 16) {
-            // 限定家的名字长度
-            PluginMessages.Warp.NAME_TOO_LONG.send(sender);
-            return true;
-        }
-        WarpInfo info = MoeTeleport.getWarpManager().getWarp(warpName);
-
-        if (!player.isOp() && !player.hasPermission("MoeTeleport.admin")) {
-            if (info != null && (info.getOwner() == null || !info.getOwner().equals(player.getUniqueId()))) {
-                PluginMessages.Warp.NOT_OWNER.send(sender, warpName);
-                return true;
-            }
-
-            int maxWarp = MoeTeleport.getUserManager().getMaxWarps(player);
-            long currentUsed = MoeTeleport.getUserManager().countUserWarps(player.getUniqueId());
-            if (currentUsed >= maxWarp && info == null) {
-                PluginMessages.Warp.OVER_LIMIT.send(sender, maxWarp);
-                return true;
-            }
-        }
-
-        MoeTeleport.getWarpManager().setWarpAsync(warpName, player.getUniqueId(), player.getLocation());
-        if (info != null) {
-            PluginMessages.Warp.OVERRIDE.send(sender, warpName, info.getLocation().toFlatString());
-        } else {
-            PluginMessages.Warp.SET.send(sender, warpName);
-        }
-
-        return true;
-    }
-}

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpTeleportCommand.java

@@ -0,0 +1,51 @@
+package cc.carm.plugin.moeteleport.command.warp;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.command.parent.WarpCommands;
+import cc.carm.plugin.moeteleport.command.sub.WarpSubCommand;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
+import cc.carm.plugin.moeteleport.manager.TeleportManager;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+public class WarpTeleportCommand extends WarpSubCommand {
+
+    public WarpTeleportCommand(@NotNull WarpCommands parent, String name, String... aliases) {
+        super(parent, name, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        if (args.length < 1) return getParent().noArgs(sender);
+
+        Player player = (Player) sender;
+
+        WarpInfo info = getWarp(args[0]);
+        if (info == null) {
+            PluginMessages.WARP.NOT_FOUND.send(player, args[0]);
+            return null;
+        }
+
+        MoeTeleport.getTeleportManager().queueTeleport(player, info.getLocation());
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return listWarpNames(sender, args[args.length - 1], false);
+        } else return Collections.emptyList();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/command/warp/WarpTpCommand.java

@@ -1,32 +0,0 @@
-package cc.carm.plugin.moeteleport.command.warp;
-
-import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.manager.TeleportManager;
-import cc.carm.plugin.moeteleport.model.WarpInfo;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class WarpTpCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
-                             @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) return false;
-        if (args.length < 1) return false;
-        Player player = (Player) sender;
-
-        WarpInfo info = MoeTeleport.getWarpManager().getWarp(args[0]);
-        if (info == null) {
-            PluginMessages.Warp.NOT_FOUND.send(player);
-            return true;
-        }
-
-        TeleportManager.teleport(player, info.getLocation(), false);
-        return true;
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/conf/PluginConfig.java

@@ -0,0 +1,201 @@
+package cc.carm.plugin.moeteleport.conf;
+
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.core.util.MapFactory;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.type.ConfiguredMap;
+import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredSound;
+import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
+
+public class PluginConfig extends ConfigurationRoot {
+
+    public static final ConfigValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
+
+    @HeaderComment({
+            "统计数据设定",
+            "该选项用于帮助开发者统计插件版本与使用情况，且绝不会影响性能与使用体验。",
+            "当然，您也可以选择在这里关闭，或在plugins/bStats下的配置文件中关闭。"
+    })
+    public static final ConfigValue<Boolean> METRICS = ConfiguredValue.of(Boolean.class, true);
+
+    @HeaderComment({
+            "检查更新设定",
+            "该选项用于插件判断是否要检查更新，若您不希望插件检查更新并提示您，可以选择关闭。",
+            "检查更新为异步操作，绝不会影响性能与使用体验。"
+    })
+    public static final ConfigValue<Boolean> CHECK_UPDATE = ConfiguredValue.of(Boolean.class, true);
+
+    @HeaderComment("简化插件指令设定")
+    public static final class COMMAND extends ConfigurationRoot {
+
+        @HeaderComment({"是否启用简化指令"})
+        public static final ConfigValue<Boolean> ENABLE = ConfiguredValue.of(Boolean.class, true);
+
+        @HeaderComment({
+                "简化指令表，配置以方便玩家使用。",
+                "格式： 简短指令: 本插件子指令(不含前缀)",
+                "如 [back: back] 代表 玩家可以输入/back 代替 /MoeTeleport back",
+                "注意：简短指令不应当包含空格，且不可与其他插件指令重复，否则将会被覆盖。",
+        })
+        public static final ConfiguredMap<String, String> ALIAS = ConfiguredMap.builder(String.class, String.class)
+                .fromString().defaults((map) -> {
+                    map.put("back", "back");
+                    map.put("tpa", "teleport to");
+                    map.put("tpaHere", "teleport here");
+                    map.put("tpAccept", "teleport accept");
+                    map.put("tpDeny", "teleport deny");
+                    map.put("tpCancel", "teleport cancel");
+
+                    map.put("home", "home to");
+                    map.put("setHome", "home set");
+                    map.put("delHome", "home delete");
+                    map.put("listHomes", "home list");
+                    map.put("listHome", "home list");
+
+                    map.put("warp", "warp to");
+                    map.put("setWarp", "warp set");
+                    map.put("delWarp", "warp delete");
+                    map.put("warpInfo", "warp info");
+                    map.put("listWarps", "warp list");
+                    map.put("listWarp", "warp list");
+                }).build();
+
+    }
+
+    @HeaderComment({"存储相关配置", "注意：存储配置不会通过重载指令生效，如有修改请重新启动服务器。"})
+    public static final class STORAGE extends ConfigurationRoot {
+
+        @HeaderComment("存储方式，可选 [ yaml | json | mysql | Essential(须安装ess插件) | CMI(须安装CMI插件) | custom(自定义，须重写功能) ]")
+        public static final ConfigValue<String> METHOD = ConfiguredValue.of(String.class, "YAML");
+
+    }
+
+    @HeaderComment("传送的相关配置")
+    public static final class TELEPORTATION extends ConfigurationRoot {
+
+        /* Will be supported again in the future
+        @HeaderComment("危险的方块类型，将判断目的地脚下的方块的类型是否在这个列表中")
+        public static final ConfiguredList<String> DANGEROUS_TYPES = ConfiguredList.builder(String.class)
+                .fromString()
+                .defaults("LAVA", "AIR")
+                .build();
+        */
+
+        @HeaderComment("传送的引导时间，单位为秒")
+        public static final ConfigValue<Integer> WAIT_TIME = ConfiguredValue.of(Integer.class, 3);
+
+        @HeaderComment("打断传送引导的方式")
+        public static final class INTERRUPT extends ConfigurationRoot {
+
+            @HeaderComment("在传送引导时是否会因为移动打断传送")
+            public static final ConfigValue<Boolean> MOVE = ConfiguredValue.of(Boolean.class, true);
+
+            @HeaderComment("在传送引导时是否会因为攻击/被攻击打断传送")
+            public static final ConfigValue<Boolean> ATTACK = ConfiguredValue.of(Boolean.class, true);
+
+            @HeaderComment("在传送引导时是否会因为下蹲打断传送")
+            public static final ConfigValue<Boolean> SNAKE = ConfiguredValue.of(Boolean.class, false);
+
+        }
+
+        @HeaderComment("传送过程中的标题")
+        public static final class TITLE extends ConfigurationRoot {
+
+            public static final ConfiguredTitle CHANNELING = PluginMessages.title().defaults(
+                    "&d&l将在 %(time) 秒后传送",
+                    "&7传送过程中请不要移动"
+            ).params("time", "target").fadeIn(0).stay(25).fadeOut(0).build();
+
+            public static final ConfiguredTitle TELEPORTED = PluginMessages.title().defaults(
+                    "&d&l传送完成",
+                    "&7已将您传送到 %(target)"
+            ).params("target").fadeIn(0).stay(20).fadeOut(10).build();
+
+        }
+
+        @HeaderComment("传送引导过程中的音效")
+        public static final class SOUND extends ConfigurationRoot {
+
+            public static final ConfiguredSound CHANNELING = ConfiguredSound.of("UI_BUTTON_CLICK", 0.5f, 1.0f);
+            public static final ConfiguredSound TELEPORTED = ConfiguredSound.of("ENTITY_ENDERMAN_TELEPORT", 0.5f, 1.0f);
+            public static final ConfiguredSound FAILED = ConfiguredSound.of("ENTITY_VILLAGER_NO", 0.5f, 1.0f);
+            public static final ConfiguredSound INTERRUPTED = ConfiguredSound.of("BLOCK_NOTE_BLOCK_BASEDRUM", 1f, 1.0f);
+
+        }
+
+        @HeaderComment("传送引导特效")
+        public static final ConfigValue<Boolean> EFFECTS = ConfiguredValue.of(Boolean.class, true);
+
+    }
+
+
+    @HeaderComment("传送请求的相关配置")
+    public static final class REQUEST extends ConfigurationRoot {
+
+        @HeaderComment("请求的过期时间，单位为秒")
+        public static final ConfigValue<Integer> EXPIRE_TIME = ConfiguredValue.of(Integer.class, 30);
+
+
+        public static final class SOUND extends ConfigurationRoot {
+
+            public static final ConfiguredSound SENT = ConfiguredSound.of("UI_BUTTON_CLICK", 0.5f, 1.0f);
+            public static final ConfiguredSound RECEIVED = ConfiguredSound.of("ENTITY_EXPERIENCE_ORB_PICKUP", 0.5f, 1.0f);
+            public static final ConfiguredSound CANCELLED = ConfiguredSound.of("ENTITY_VILLAGER_NO", 0.5f, 1.0f);
+
+        }
+
+    }
+
+    @HeaderComment("返回上一传送点的相关配置")
+    public static final class BACK extends ConfigurationRoot {
+
+        @HeaderComment("是否启用返回上一传送点功能")
+        public static final ConfigValue<Boolean> ENABLE = ConfiguredValue.of(Boolean.class, false);
+
+        @HeaderComment({"返回死亡点", "开启后将允许玩家输入 /back 返回死亡地点。"})
+        public static final ConfigValue<Boolean> DEATH = ConfiguredValue.of(Boolean.class, true);
+
+    }
+
+    @HeaderComment("“家”功能相关配置")
+    public static final class HOMES extends ConfigurationRoot {
+
+        @HeaderComment("是否启用家功能")
+        public static final ConfigValue<Boolean> ENABLE = ConfiguredValue.of(Boolean.class, false);
+
+        @HeaderComment("普通玩家可设置多少家")
+        public static final ConfigValue<Integer> DEFAULTS = ConfiguredValue.of(Integer.class, 2);
+
+        @HeaderComment("设定权限对应的可设置家的数量。 (数量: 权限)")
+        public static final ConfiguredMap<Integer, String> PERMISSIONS = ConfiguredMap
+                .builder(Integer.class, String.class)
+                .fromString()
+                .parseKey(Integer::parseInt).serializeKey(Object::toString)
+                .defaults(MapFactory.linkedMap(10, "MoeTeleport.vip").build())
+                .build();
+
+    }
+
+    @HeaderComment("“地标”功能相关配置")
+    public static final class WARPS extends ConfigurationRoot {
+
+        @HeaderComment("是否启用地标功能")
+        public static final ConfigValue<Boolean> ENABLE = ConfiguredValue.of(Boolean.class, false);
+
+        @HeaderComment("普通玩家可设置多少地标")
+        public static final ConfigValue<Integer> DEFAULTS = ConfiguredValue.of(Integer.class, 0);
+
+        @HeaderComment("设定权限对应的可设置地标的数量。 (数量: 权限)")
+        public static final ConfiguredMap<Integer, String> PERMISSIONS = ConfiguredMap
+                .builder(Integer.class, String.class)
+                .fromString()
+                .parseKey(Integer::parseInt).serializeKey(Object::toString)
+                .defaults(MapFactory.linkedMap(2, "MoeTeleport.vip").build())
+                .build();
+    }
+
+
+}

src/main/java/cc/carm/plugin/moeteleport/conf/PluginMessages.java

@@ -0,0 +1,361 @@
+package cc.carm.plugin.moeteleport.conf;
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.easyplugin.utils.ColorParser;
+import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageListBuilder;
+import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageValueBuilder;
+import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder;
+import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessage;
+import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList;
+import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
+import de.themoep.minedown.MineDown;
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.md_5.bungee.api.chat.BaseComponent;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BiFunction;
+
+public class PluginMessages extends ConfigurationRoot {
+
+    public static @NotNull CraftMessageListBuilder<BaseComponent[]> list() {
+        return ConfiguredMessageList.create(getParser())
+                .whenSend((sender, message) -> message.forEach(m -> sender.spigot().sendMessage(m)));
+    }
+
+    public static @NotNull CraftMessageValueBuilder<BaseComponent[]> value() {
+        return ConfiguredMessage.create(getParser())
+                .whenSend((sender, message) -> sender.spigot().sendMessage(message));
+    }
+
+    public static @NotNull TitleConfigBuilder title() {
+        return ConfiguredTitle.create().whenSend((player, in, stay, out, line1, line2) -> player.sendTitle(line1, line2, in, stay, out));
+    }
+
+    public static @NotNull BiFunction<CommandSender, String, BaseComponent[]> getParser() {
+        return (sender, message) -> {
+            if (sender instanceof Player) message = PlaceholderAPI.setPlaceholders((Player) sender, message);
+            return MineDown.parse(ColorParser.parse(message));
+        };
+    }
+
+    public static final ConfiguredMessageList<BaseComponent[]> NO_PERMISSION = list().defaults(
+            "&c&l抱歉！&f但您没有足够的权限使用该指令。"
+    ).build();
+
+    public static final ConfiguredMessageList<BaseComponent[]> NOT_ONLINE = list().defaults(
+            "&f目标玩家并不在线，无法发送请求。"
+    ).build();
+
+    public static final ConfiguredMessageList<BaseComponent[]> NOT_PLAYER = list().defaults(
+            "&f该指令请以玩家身份执行。"
+    ).build();
+
+    public static final ConfiguredMessageList<BaseComponent[]> NOT_ENABLED = list().defaults(
+            "&f该功能在次服务器中并未被启用。"
+    ).build();
+
+    public static class USAGE extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> COMMAND = list().defaults(
+                "&5&l喵喵传送 &f指令帮助",
+                "&8#&f teleport help",
+                "&8-&7 查看传送请求相关帮助。",
+                "&8#&f warp help",
+                "&8-&7 查看地标点相关帮助。",
+                "&8#&f home Help",
+                "&8-&7 查看家传送点的相关帮助。",
+                "&8#&f back",
+                "&8-&7 回到之前的传送位置。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> TELEPORT = list().defaults(
+                "&5&l喵喵传送 &f传送指令帮助",
+                "&8#&f teleport to &d<目标玩家>",
+                "&8-&7 请求传送到目标玩家的位置。",
+                "&8#&f teleport here &d<目标玩家>",
+                "&8-&7 请求目标玩家传送到自己的位置。",
+                "&8#&f teleport accept &d[玩家]",
+                "&8-&7 同意一个传送请求(可具体指定玩家的请求)。",
+                "&8#&f teleport deny &d[玩家]",
+                "&8-&7 拒绝一个传送请求(可具体指定玩家的请求)。",
+                "&8#&f teleport cancel",
+                "&8-&7 取消已经发出的传送请求。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> WARPS = list().defaults(
+                "&5&l喵喵传送 &f地标指令帮助",
+                "&8#&f warp list",
+                "&8-&7 列出当前所有的地标点。",
+                "&8#&f warp to &d<地标名>",
+                "&8-&7 传送到指定的地标点。",
+                "&8#&f warp set &d[地标名]",
+                "&8-&7 设定一个地标点。",
+                "&8-&7&o 若地标点已存在，且您是地标点的设立者，",
+                "&8-&7&o 则会覆盖原有的地标点位置。",
+                "&8#&f warp delete &d[地标名]",
+                "&8-&7 删除一个自己设立的地标点。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> HOMES = list().defaults(
+                "&5&l喵喵传送 &f家指令帮助",
+                "&8#&f home list",
+                "&8-&7 列出所有的家位置。",
+                "&8#&f home to &d[家名]",
+                "&8-&7 传送到指定的家。",
+                "&8-&7&o 若不填写具体的名称则返回首个设置的家，",
+                "&8-&7&o 若存在名为“home”的家则优先返回“home”。",
+                "&8#&f home set &d[家名]",
+                "&8-&7 设定一个家的位置。",
+                "&8-&7&o 若不填写家的名称则默认为“home”",
+                "&8#&f home delete &d[家名]",
+                "&8-&7 删除一个家的位置。"
+        ).build();
+
+    }
+
+    public static class RELOAD extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> START = list().defaults(
+                "&f正在重载配置文件..."
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> ERROR = list().defaults(
+                "&f配置文件&c重载失败！&f详细原因详见后台输出。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> COMPLETE = list().defaults(
+                "&f配置文件重载完成，共耗时 &d%(time)&fms 。"
+        ).params("time").build();
+
+    }
+
+    public static class BACK extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> NO_LAST_LOCATION = list().defaults(
+                "&f您当前没有进行任何传送，无法返回上个地点。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> DEATH_MESSAGE = list().defaults(
+                "&f您可以输入 &5/back &f或 [&d&l点击这里](show_text=点击返回到死亡地点 run_command=/moeteleport back) &f返回您的死亡地点。"
+        ).build();
+
+    }
+
+    public static class TELEPORT extends ConfigurationRoot {
+        public static final ConfiguredMessageList<BaseComponent[]> TELEPORTED = list().defaults(
+                "&f正在将您传送到 &d%(target) &f..."
+        ).params("target").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NOT_SAFE = list().defaults(
+                "&f目标地点 &d%(location) &f可能并不安全，因此传送被暂缓执行。",
+                "&7如您确认传送到目标位置，请再次输入接受指令以执行本次传送。"
+        ).params("location").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NOT_AVAILABLE = list().defaults(
+                "&f目标地点丢失，暂时无法前往，传送被取消。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> INTERRUPTED = list().defaults(
+                "&c&l传送中断！&f传送过程中请不要移动。"
+        ).build();
+
+    }
+
+    public static class REQUESTS extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> SELF = list().defaults("&f您不能向自己发送请求。").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> OFFLINE = list().defaults(
+                "&d%(player) &f离线，相关请求已自动取消。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> MULTI = list().defaults(
+                "&f您当前有&d%(num)条请求&f待处理，请输入 &5/%(command) <玩家名> &f决定回应谁的请求。",
+                "&f您也可以再次输入 &5/%(command) &f快速回应最近的一条请求。"
+        ).params("num", "command").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> EMPTY_REQUESTS = list()
+                .defaults("&f您当前没有任何待处理的传送请求。")
+                .build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NO_REQUEST_FROM = list().defaults(
+                "&f您当前没有收到来自 &d%(player) &f的传送请求。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> SENT = list().defaults(
+                "&f成功向玩家 &d%(player) &f发送传送请求，对方有 &5%(expire)秒 &f的时间回应该请求。"
+        ).params("player", "expire").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> DUPLICATE = list().defaults(
+                "&f您已经向 &d%(player) &f发送过传送请求，对方仍有 &5%(expire)秒 &f的时间回应该请求。",
+                "&f如您想要取消该请求，请输入 [&e&l[点击取消]](show_text=点击同意请求 run_command=/moeteleport teleport cancel %(player)) &f或输入 &5/tpCancel &f取消该请求。"
+        ).params("player", "expire").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> RECEIVED_TP_HERE = list().defaults(
+                "&d%(player) &f请求传送到您身边，您有 &5%(expire)秒 &f的时间回应。",
+                "  [&a&l[点击同意]](show_text=点击同意请求 run_command=/moeteleport teleport accept %(player)) &f或输入 &5/tpAccept &f同意该请求。",
+                "  [&c&l[点击拒绝]](show_text=点击拒绝请求 run_command=/moeteleport teleport deny %(player)) &f或输入 &5/tpDeny &f拒绝该请求。"
+        ).params("player", "expire").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> RECEIVED_TP_TO = list().defaults(
+                "&d%(player) &f请求传送您到Ta身边，您有 &5%(expire)秒 &f的时间回应。",
+                "  [&a&l[点击同意]](show_text=点击同意请求 run_command=/moeteleport teleport accept %(player)) &f或输入 &5/tpAccept &f同意该请求。",
+                "  [&c&l[点击拒绝]](show_text=点击拒绝请求 run_command=/moeteleport teleport deny %(player)) &f或输入 &5/tpDeny &f拒绝该请求。"
+        ).params("player", "expire").build();
+
+
+        public static final ConfiguredMessageList<BaseComponent[]> ACCEPTED = list().defaults(
+                "&f您同意了 &d%(player) &f的传送请求。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> DENIED = list().defaults(
+                "&f您&d拒绝&f了 &d%(player) &f的传送请求。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> WAS_ACCEPTED = list().defaults(
+                "&d%(player) &f同意了您的传送请求。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> WAS_DENIED = list().defaults(
+                "&d%(player) &f拒绝了您的传送请求。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> SENT_TIMEOUT = list().defaults(
+                "&f发往 &d%(player) &f的传送请求已超时。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> RECEIVED_TIMEOUT = list().defaults(
+                "&f来自 &d%(player) &f的传送请求已超时。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> SENT_CANCELLED = list().defaults(
+                "&f发往 &d%(player) &f的传送请求已取消。"
+        ).params("player").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> RECEIVED_CANCELLED = list().defaults(
+                "&f来自 &d%(player) &f的传送请求已被取消。"
+        ).params("player").build();
+
+    }
+
+
+    public static class HOME extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> EMPTY = list().defaults(
+                "&f您还没有设置任何家的位置，快设置一个吧！"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NAME_TOO_LONG = list()
+                .defaults("&f您所输入的家的名字太长，家的名称不应当超过 &d32 &f个字符。")
+                .build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> OVER_LIMIT = list().defaults(
+                "&f您最多只能设置 &d%(max) &f个家传送点！",
+                "&7可以输入 &5/delHome <家名称> &7删除之前的家传送点，",
+                "&7或输入 &5/setHome <家名称> &7覆盖之前的家传送点。"
+        ).params("max").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NOT_FOUND = list()
+                .defaults("&f您还没有设置这个家，请先输入 &5/setHome <家名称> &f设置一个吧！")
+                .build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> SET = list().defaults(
+                "&f成功设定名为 &d%(name) &f的家传送点。"
+        ).params("name").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> OVERRIDE = list().defaults(
+                "&f成功覆盖名为 &d%(name) &f的家传送点。",
+                "&8原先位置为 &5%(location) &8。"
+        ).params("name", "location").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> REMOVED = list().defaults(
+                "&f成功移除名为 &d%(name) &f的家传送点。",
+                "&8原先位置为 &5%(location) &8。"
+        ).params("name", "location").build();
+
+        public static class LIST extends ConfigurationRoot {
+
+            public static final ConfiguredMessageList<BaseComponent[]> HEADER = list().defaults(
+                    "&f您当前设定的所有家："
+            ).build();
+
+            public static final ConfiguredMessageList<BaseComponent[]> OBJECT = list().defaults(
+                    "&8# &f%(id) &d%(location) [&7✈](show_text=点击返回家 %(id) run_command=/moeteleport home to %(id))"
+            ).params("id", "location").build();
+
+        }
+
+    }
+
+    public static class WARP extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> EMPTY = list().defaults(
+                "&f当前服务器暂无任何地标点，快设置一个吧！"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NOT_OWNER = list().defaults(
+                "&f您不是地标 &d%(name) &f的创建者，无法进行此操作。"
+        ).params("name").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NOT_FOUND = list()
+                .defaults("&f目前暂不存在ID为 %(id) 的地标点。")
+                .params("id")
+                .build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> NAME_TOO_LONG = list()
+                .defaults("&f您所输入的家的名字太长，地标的名称不应当超过 &d16 &f个字符。")
+                .build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> OVER_LIMIT = list().defaults(
+                "&f您最多只能设置 &d%(max) &f个地标传送点！",
+                "&7可以输入 &5/delWarp <地标名称> &7删除之前的地标传送点，",
+                "&7或输入 &5/setWarp <地标名称> &7覆盖之前的地标传送点。"
+        ).params("max").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> INFO_LOCATION = list().defaults(
+                "&f地标点 &d%(name) &f所在位置为 &5%(location) &f。[&7✈](show_text=点击前往&d %(name) run_command=/moeteleport warp to %(name))"
+        ).params("name", "location").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> INFO_FULL = list().defaults(
+                "&f地标点 &d%(name) &f由 &5%(owner) &f创建，所在位置为 &d%(location) &f。[&7✈](show_text=点击前往&d %(name) run_command=/moeteleport warp to %(name))"
+        ).params("name", "owner", "location").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> SET = list().defaults(
+                "&f成功设定名为 &d%(name) &f的地标传送点。"
+        ).params("name").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> OVERRIDE = list().defaults(
+                "&f成功覆盖名为 &d%(name) &f的地标传送点。",
+                "&8原先位置为 &5%(location) &8。"
+        ).params("name", "location").build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> REMOVED = list().defaults(
+                "&f成功移除名为 &d%(name) &f的地标传送点。",
+                "&8原先位置为 &5%(location) &8。"
+        ).params("name", "location").build();
+
+
+        public static class LIST extends ConfigurationRoot {
+
+            public static final ConfiguredMessageList<BaseComponent[]> HEADER = list().defaults(
+                    "&f当前地标列表 &7(第&f%(current)&8/%(max)&7页)："
+            ).params("current", "max").build();
+
+            public static final ConfiguredMessageList<BaseComponent[]> OBJECT = list().defaults(
+                    "&8# &f%(id) &7[由%(owner)创建]",
+                    "&8- &d%(location) [&7✈](show_text=点击前往&d %(id) run_command=/moeteleport warp to %(id))"
+            ).params("id", "owner", "location").build();
+
+            public static final ConfiguredMessageList<BaseComponent[]> OBJECT_NO_OWNER = list().defaults(
+                    "&8# &f%(id)",
+                    "&8- &d%(location) [&7✈](show_text=点击前往&d %(id) run_command=/moeteleport warp to %(id))"
+            ).params("id", "location").build();
+
+        }
+
+    }
+
+
+}

src/main/java/cc/carm/plugin/moeteleport/conf/location/DataLocation.java

@@ -1,4 +1,4 @@
-package cc.carm.plugin.moeteleport.configuration.location;
+package cc.carm.plugin.moeteleport.conf.location;
 
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;

src/main/java/cc/carm/plugin/moeteleport/configuration/PluginConfig.java

@@ -1,53 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration;
-
-import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
-import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
-import cc.carm.lib.easyplugin.configuration.values.ConfigValueMap;
-
-public class PluginConfig {
-
-    public static final ConfigValue<Boolean> DEBUG = new ConfigValue<>(
-            "debug", Boolean.class, false
-    );
-
-    public static final ConfigValue<Boolean> METRICS = new ConfigValue<>(
-            "metrics", Boolean.class, true
-    );
-
-    public static final ConfigValue<Boolean> CHECK_UPDATE = new ConfigValue<>(
-            "check-update", Boolean.class, true
-    );
-
-    public static final ConfigValue<String> STORAGE_METHOD = new ConfigValue<>(
-            "storage.method", String.class, "YAML"
-    );
-
-    public static final ConfigValueMap<Integer, String> HOME_PERMISSIONS = new ConfigValueMap<>(
-            "permissions.home", Integer::parseInt, String.class
-    );
-
-    public static final ConfigValueMap<Integer, String> WARP_PERMISSIONS = new ConfigValueMap<>(
-            "permissions.warp", Integer::parseInt, String.class
-    );
-
-    public static final ConfigValueList<String> DANGEROUS_TYPES = new ConfigValueList<>(
-            "dangerous-blocks", String.class, new String[]{"LAVA"}
-    );
-
-    public static final ConfigValue<Integer> EXPIRE_TIME = new ConfigValue<>(
-            "expireTime", Integer.class, 30
-    );
-
-    public static final ConfigValue<Integer> DEFAULT_HOME = new ConfigValue<>(
-            "defaults.home", Integer.class, 1
-    );
-
-    public static final ConfigValue<Integer> DEFAULT_WARP = new ConfigValue<>(
-            "defaults.warp", Integer.class, 0
-    );
-
-    public static final ConfigValue<Boolean> DEATH_GO_BACK = new ConfigValue<>(
-            "death-back", Boolean.class, true
-    );
-
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/PluginMessages.java

@@ -1,224 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration;
-
-import cc.carm.lib.easyplugin.configuration.language.EasyMessageList;
-import cc.carm.lib.easyplugin.configuration.language.MessagesRoot;
-import cc.carm.plugin.moeteleport.configuration.messages.MoeMessageList;
-
-public class PluginMessages extends MessagesRoot {
-
-    public static final EasyMessageList NOT_ONLINE = MoeMessageList.builder().contents(
-            "&f目标玩家并不在线，无法发送请求。"
-    ).build();
-
-    public static class Back {
-
-        public static final EasyMessageList NO_LAST_LOCATION = MoeMessageList.builder().contents(
-                "&f您当前没有进行任何传送，无法返回上个地点。"
-        ).build();
-
-        public static final EasyMessageList DEATH_MESSAGE = MoeMessageList.builder().contents(
-                "&f您可以输入 &5/back &f或 [&d&l点击这里](show_text=点击返回到死亡地点 run_command=/back) &f返回您的死亡地点。"
-        ).build();
-
-    }
-
-    public static class Teleport {
-        public static final EasyMessageList TELEPORTING = MoeMessageList.builder().contents(
-                "&f正在将您传送到 &d%(location) &f..."
-        ).params("location").build();
-
-        public static final EasyMessageList NOT_SAFE = MoeMessageList.builder().contents(
-                "&f目标地点 &d%(location) &f并不安全，因此传送被取消。",
-                "&7如需传送，请告知请求者到达安全位置后重新发送传送请求。"
-        ).params("location").build();
-
-        public static final EasyMessageList NOT_AVAILABLE = MoeMessageList.builder().contents(
-                "&f目标地点暂时无法前往，传送被取消。"
-        ).build();
-
-    }
-
-    public static class Requests {
-
-        public static final EasyMessageList SELF = MoeMessageList.builder().contents("&f您不能向自己发送请求。").build();
-
-        public static final EasyMessageList OFFLINE = MoeMessageList.builder().contents(
-                "&d%(player) &f离线，相关请求已自动取消。"
-        ).params("player").build();
-
-        public static final EasyMessageList MULTI = MoeMessageList.builder().contents(
-                "&f您当前有&d%(num)条请求&f待处理，请输入 &5/%(command) <玩家名> &f决定回应谁的请求。",
-                "&f您也可以再次输入 &5/%(command) &f快速回应最近的一条请求。"
-        ).params("num", "command").build();
-
-
-        public static final EasyMessageList EMPTY_REQUESTS = MoeMessageList.builder()
-                .contents("&f您当前没有任何待处理的传送请求。")
-                .build();
-
-        public static final EasyMessageList NO_REQUEST_FROM = MoeMessageList.builder().contents(
-                "&f您当前没有收到来自 &d%(player) &f的传送请求。"
-        ).params("player").build();
-
-        public static final EasyMessageList SENT = MoeMessageList.builder().contents(
-                "&f成功向玩家 &d%(player) &f发送传送请求，对方有 &5%(expire)秒 &f的时间回应该请求。"
-        ).params("player", "expire").build();
-
-        public static final EasyMessageList DUPLICATE = MoeMessageList.builder().contents(
-                "&f您已经向 &d%(player) &f发送过传送请求，对方仍有 &5%(expire)秒 &f的时间回应该请求。"
-        ).params("player", "expire").build();
-
-        public static final EasyMessageList RECEIVED_TP_HERE = MoeMessageList.builder().contents(
-                "&d%(player) &f请求传送到您身边，您有 &5%(expire)秒 &f的时间回应。",
-                "  [&a&l[点击同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f或输入 &5/tpAccept &f同意该请求。",
-                "  [&c&l[点击拒绝]](show_text=点击拒绝请求 run_command=/tpDeny %(player)) &f或输入 &5/tpDeny &f拒绝该请求。"
-        ).params("player", "expire").build();
-
-        public static final EasyMessageList RECEIVED_TP_TO = MoeMessageList.builder().contents(
-                "&d%(player) &f请求传送您到Ta身边，您有 &5%(expire)秒 &f的时间回应。",
-                "  [&a&l[点击同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f或输入 &5/tpAccept &f同意该请求。",
-                "  [&c&l[点击拒绝]](show_text=点击拒绝请求 run_command=/tpDeny %(player)) &f或输入 &5/tpDeny &f拒绝该请求。"
-        ).params("player", "expire").build();
-
-
-        public static final EasyMessageList ACCEPTED = MoeMessageList.builder().contents(
-                "&f您同意了 &d%(player) &f的传送请求。"
-        ).params("player").build();
-
-        public static final EasyMessageList DENIED = MoeMessageList.builder().contents(
-                "&f您&d拒绝&f了 &d%(player) &f的传送请求。"
-        ).params("player").build();
-
-        public static final EasyMessageList WAS_ACCEPTED = MoeMessageList.builder().contents(
-                "&d%(player) &f同意了您的传送请求。"
-        ).params("player").build();
-
-        public static final EasyMessageList WAS_DENIED = MoeMessageList.builder().contents(
-                "&d%(player) &f拒绝了您的传送请求。"
-        ).params("player").build();
-
-        public static final EasyMessageList SENT_TIMEOUT = MoeMessageList.builder().contents(
-                "&f发往 &d%(player) &f的传送请求已超时。"
-        ).params("player").build();
-
-        public static final EasyMessageList RECEIVED_TIMEOUT = MoeMessageList.builder().contents(
-                "&f来自 &d%(player) &f的传送请求已超时。"
-        ).params("player").build();
-
-    }
-
-
-    public static class Home {
-
-        public static final EasyMessageList NAME_TOO_LONG = MoeMessageList.builder()
-                .contents("&f您所输入的家的名字太长，家的名称不应当超过 &d32 &f个字符。")
-                .build();
-
-        public static final EasyMessageList OVER_LIMIT = MoeMessageList.builder().contents(
-                "&f您最多只能设置 &d%(max) &f个家传送点！",
-                "&7可以输入 &5/delHome <家名称> &7删除之前的家传送点，",
-                "&7或输入 &5/setHome <家名称> &7覆盖之前的家传送点。"
-        ).params("max").build();
-
-        public static final EasyMessageList NOT_FOUND = MoeMessageList.builder()
-                .contents("&f您还没有设置这个家，请先输入 &5/setHome <家名称> &f设置一个吧！")
-                .build();
-
-        public static final EasyMessageList SET = MoeMessageList.builder().contents(
-                "&f成功设定名为 &d%(name) &f的家传送点。"
-        ).params("name").build();
-
-        public static final EasyMessageList OVERRIDE = MoeMessageList.builder().contents(
-                "&f成功覆盖名为 &d%(name) &f的家传送点。",
-                "&8原先位置为 &5%(location) &8。"
-        ).params("name", "location").build();
-
-        public static final EasyMessageList REMOVED = MoeMessageList.builder().contents(
-                "&f成功移除名为 &d%(name) &f的家传送点。",
-                "&8原先位置为 &5%(location) &8。"
-        ).params("name", "location").build();
-
-        public static class List {
-
-            public static final EasyMessageList HEADER = MoeMessageList.builder().contents(
-                    "&f您当前设定的所有家："
-            ).build();
-
-            public static final EasyMessageList OBJECT = MoeMessageList.builder().contents(
-                    "&8# &f%(id) &d%(location) [&7✈](show_text=点击返回家 %(id) run_command=/home %(id))"
-            ).params("id", "location").build();
-
-        }
-
-    }
-
-    public static class Warp {
-
-        public static final EasyMessageList EMPTY = MoeMessageList.builder().contents(
-                "&f当前服务器暂无任何地标点，快设置一个吧！"
-        ).build();
-
-        public static final EasyMessageList NOT_OWNER = MoeMessageList.builder().contents(
-                "&f您不是地标 &d%(name) &f的创建者，无法进行此操作。"
-        ).params("name").build();
-
-        public static final EasyMessageList NOT_FOUND = MoeMessageList.builder()
-                .contents("&f目前暂不存在该地标。")
-                .build();
-
-        public static final EasyMessageList NAME_TOO_LONG = MoeMessageList.builder()
-                .contents("&f您所输入的家的名字太长，地标的名称不应当超过 &d16 &f个字符。")
-                .build();
-
-        public static final EasyMessageList OVER_LIMIT = MoeMessageList.builder().contents(
-                "&f您最多只能设置 &d%(max) &f个地标传送点！",
-                "&7可以输入 &5/delWarp <地标名称> &7删除之前的地标传送点，",
-                "&7或输入 &5/setWarp <地标名称> &7覆盖之前的地标传送点。"
-        ).params("max").build();
-
-        public static final EasyMessageList INFO_LOCATION = MoeMessageList.builder().contents(
-                "&f地标点 &d%(name) &f所在位置为 &5%(location) &f。[&7✈](show_text=点击前往&d %(name) run_command=/warp %(name))"
-        ).params("name", "location").build();
-
-        public static final EasyMessageList INFO_FULL = MoeMessageList.builder().contents(
-                "&f地标点 &d%(name) &f由 &5%(owner) &f创建，所在位置为 &d%(location) &f。[&7✈](show_text=点击前往&d %(name) run_command=/warp %(name))"
-        ).params("name", "owner", "location").build();
-
-        public static final EasyMessageList SET = MoeMessageList.builder().contents(
-                "&f成功设定名为 &d%(name) &f的地标传送点。"
-        ).params("name").build();
-
-        public static final EasyMessageList OVERRIDE = MoeMessageList.builder().contents(
-                "&f成功覆盖名为 &d%(name) &f的地标传送点。",
-                "&8原先位置为 &5%(location) &8。"
-        ).params("name", "location").build();
-
-        public static final EasyMessageList REMOVED = MoeMessageList.builder().contents(
-                "&f成功移除名为 &d%(name) &f的地标传送点。",
-                "&8原先位置为 &5%(location) &8。"
-        ).params("name", "location").build();
-
-
-        public static class List {
-
-            public static final EasyMessageList HEADER = MoeMessageList.builder().contents(
-                    "&f当前地标列表 &7(第&f%(current)&8/%(max)&7页)："
-            ).params("current", "max").build();
-
-            public static final EasyMessageList OBJECT = MoeMessageList.builder().contents(
-                    "&8# &f%(id) &7[由%(owner)创建]",
-                    "&8- &d%(location) [&7✈](show_text=点击前往&d %(id) run_command=/warp %(id))"
-            ).params("id", "owner", "location").build();
-
-            public static final EasyMessageList OBJECT_NO_OWNER = MoeMessageList.builder().contents(
-                    "&8# &f%(id)",
-                    "&8- &d%(location) [&7✈](show_text=点击前往&d %(id) run_command=/warp %(id))"
-            ).params("id", "location").build();
-
-        }
-
-
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/messages/MoeMessage.java

@@ -1,33 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.messages;
-
-import cc.carm.lib.easyplugin.configuration.language.EasyMessage;
-import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageBuilder;
-import de.themoep.minedown.MineDown;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.Nullable;
-
-public class MoeMessage extends EasyMessage {
-
-    public MoeMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
-        super(defaultValue, messageParams);
-    }
-
-    public static EasyMessageBuilder builder() {
-        return new EasyMessageBuilder() {
-            @Override
-            public MoeMessage build() {
-                return new MoeMessage(this.content, buildParams());
-            }
-        };
-    }
-
-    @Override
-    public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-        if (sender == null) return;
-        String message = get(sender, params, values);
-        if (message.length() < 1) return;
-        sender.spigot().sendMessage(MineDown.parse(message));
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/messages/MoeMessageList.java

@@ -1,37 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.messages;
-
-import cc.carm.lib.easyplugin.configuration.language.EasyMessageList;
-import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageListBuilder;
-import de.themoep.minedown.MineDown;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-public class MoeMessageList extends EasyMessageList {
-
-    public MoeMessageList(@Nullable String[] defaultValue, @Nullable String[] messageParams) {
-        super(defaultValue, messageParams);
-    }
-
-    public static EasyMessageListBuilder builder() {
-        return new EasyMessageListBuilder() {
-            @Override
-            public MoeMessageList build() {
-                return new MoeMessageList(this.contents, buildParams());
-            }
-        };
-    }
-
-    @Override
-    public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-        if (sender == null) return;
-        List<String> messages = get(sender, params, values);
-        if (messages.isEmpty()) return;
-        if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
-        messages.forEach(message -> sender.spigot().sendMessage(MineDown.parse(message)));
-
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/effect/TeleportEffect.java

@@ -0,0 +1,8 @@
+package cc.carm.plugin.moeteleport.effect;
+
+public class TeleportEffect {
+
+
+
+
+}

src/main/java/cc/carm/plugin/moeteleport/listener/TeleportListener.java

@@ -0,0 +1,56 @@
+package cc.carm.plugin.moeteleport.listener;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
+import cc.carm.plugin.moeteleport.teleport.TeleportQueue;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
+
+public class TeleportListener implements Listener {
+
+    @EventHandler
+    public void onMove(PlayerMoveEvent event) {
+        if (!PluginConfig.TELEPORTATION.INTERRUPT.MOVE.getNotNull()) return;
+
+        Location from = event.getFrom();
+        Location to = event.getTo();
+        if (to == null) return;
+
+        if (from.getBlockX() == to.getBlockX()
+                && from.getBlockY() == to.getBlockY()
+                && from.getBlockZ() == to.getBlockZ()) {
+            return;
+        }
+
+        TeleportQueue queue = MoeTeleport.getTeleportManager().getQueue(event.getPlayer());
+        if (queue == null) return;
+
+        MoeTeleport.getTeleportManager().interruptQueue(queue);
+    }
+
+    @EventHandler
+    public void onDamage(EntityDamageByEntityEvent event) {
+        if (!PluginConfig.TELEPORTATION.INTERRUPT.ATTACK.getNotNull()) return;
+        if (!(event.getEntity() instanceof Player)) return;
+
+        TeleportQueue queue = MoeTeleport.getTeleportManager().getQueue((Player) event.getEntity());
+        if (queue == null) return;
+
+        MoeTeleport.getTeleportManager().interruptQueue(queue);
+    }
+
+    @EventHandler
+    public void onSnake(PlayerToggleSneakEvent event) {
+        if (!PluginConfig.TELEPORTATION.INTERRUPT.SNAKE.getNotNull()) return;
+        TeleportQueue queue = MoeTeleport.getTeleportManager().getQueue(event.getPlayer());
+        if (queue == null) return;
+
+        MoeTeleport.getTeleportManager().interruptQueue(queue);
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/listener/UserListener.java

@@ -1,8 +1,8 @@
 package cc.carm.plugin.moeteleport.listener;
 
 import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -26,10 +26,10 @@ public class UserListener implements Listener {
 
     @EventHandler
     public void onDeath(PlayerDeathEvent event) {
-        if (PluginConfig.DEATH_GO_BACK.get()) {
+        if (PluginConfig.BACK.DEATH.getNotNull()) {
             Player player = event.getEntity();
             MoeTeleport.getUserManager().getData(player).setLastLocation(player.getLocation());
-            PluginMessages.Back.DEATH_MESSAGE.send(player);
+            PluginMessages.BACK.DEATH_MESSAGE.send(player);
         }
     }
 

src/main/java/cc/carm/plugin/moeteleport/manager/CommandManager.java

@@ -0,0 +1,122 @@
+package cc.carm.plugin.moeteleport.manager;
+
+import cc.carm.plugin.moeteleport.Main;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.plugin.SimplePluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+public class CommandManager {
+
+    protected final JavaPlugin plugin;
+
+    protected final SimpleCommandMap commandMap;
+    protected final Field knownCommandsFiled;
+
+    protected final Map<String, AliasCommand> registeredCommands = new HashMap<>();
+
+    public CommandManager(JavaPlugin plugin) throws Exception {
+        this.plugin = plugin;
+
+        SimplePluginManager manager = (SimplePluginManager) Bukkit.getPluginManager();
+        Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
+        commandMapField.setAccessible(true);
+        this.commandMap = (SimpleCommandMap) commandMapField.get(manager);
+
+        this.knownCommandsFiled = SimpleCommandMap.class.getDeclaredField("knownCommands");
+        this.knownCommandsFiled.setAccessible(true);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    protected Map<String, Command> getKnownCommands() {
+        try {
+            return (Map<String, Command>) knownCommandsFiled.get(commandMap);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return new HashMap<>();
+    }
+
+    public String getPrefix() {
+        return this.plugin.getName().toLowerCase() + " ";
+    }
+
+    protected SimpleCommandMap getCommandMap() {
+        return commandMap;
+    }
+
+    public void register(String alias, String target) {
+        AliasCommand current = this.registeredCommands.get(alias);
+        if (current != null) current.unregister(getCommandMap());
+
+        AliasCommand cmd = new AliasCommand(alias, this, getPrefix() + target);
+        this.registeredCommands.put(alias, cmd);
+        getCommandMap().register(Main.getInstance().getName(), cmd);
+    }
+
+    public void unregister(String alias) {
+        AliasCommand current = this.registeredCommands.remove(alias);
+        if (current != null) {
+            getKnownCommands().remove(alias);
+            current.unregister(getCommandMap());
+        }
+    }
+
+    public void unregisterAll() {
+        registeredCommands.forEach((k, v) -> {
+            getKnownCommands().remove(k);
+            v.unregister(getCommandMap());
+        });
+        registeredCommands.clear();
+    }
+
+    public static class AliasCommand extends Command {
+
+        protected final CommandManager commandManager;
+        protected final String targetCommand;
+
+        public AliasCommand(String name, CommandManager commandManager, String targetCommand) {
+            super(name);
+            this.commandManager = commandManager;
+            this.targetCommand = targetCommand;
+        }
+
+        protected SimpleCommandMap getCommandMap() {
+            return this.commandManager.getCommandMap();
+        }
+
+        protected String buildCommand(String[] args) {
+            return this.targetCommand + " " + String.join(" ", args);
+        }
+
+        @Override
+        public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
+            return getCommandMap().dispatch(sender, buildCommand(args));
+        }
+
+        @NotNull
+        @Override
+        public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias,
+                                        @NotNull String[] args, @Nullable Location location) throws IllegalArgumentException {
+            return Optional.ofNullable(getCommandMap().tabComplete(sender, buildCommand(args))).orElse(Collections.emptyList());
+        }
+
+        @NotNull
+        @Override
+        public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
+            return tabComplete(sender, alias, args, null);
+        }
+
+    }
+
+
+}

src/main/java/cc/carm/plugin/moeteleport/manager/ConfigManager.java

@@ -1,57 +0,0 @@
-package cc.carm.plugin.moeteleport.manager;
-
-import cc.carm.lib.easyplugin.configuration.file.FileConfig;
-import cc.carm.lib.easyplugin.configuration.language.MessagesConfig;
-import cc.carm.lib.easyplugin.configuration.language.MessagesInitializer;
-import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-
-import java.io.IOException;
-
-public class ConfigManager {
-
-    private static FileConfig config;
-    private static MessagesConfig messageConfig;
-
-    public static boolean initConfig() {
-        try {
-            ConfigManager.config = new FileConfig(Main.getInstance());
-            ConfigManager.messageConfig = new MessagesConfig(Main.getInstance());
-
-            FileConfig.pluginConfiguration = () -> config;
-            FileConfig.messageConfiguration = () -> messageConfig;
-
-            MessagesInitializer.initialize(messageConfig, PluginMessages.class);
-
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    public static FileConfig getPluginConfig() {
-        return config;
-    }
-
-    public static FileConfig getMessageConfig() {
-        return messageConfig;
-    }
-
-    public static void reload() {
-        try {
-            getPluginConfig().reload();
-            getMessageConfig().reload();
-        } catch (Exception ignored) {
-        }
-    }
-
-    public static void saveConfig() {
-        try {
-            getPluginConfig().save();
-            getMessageConfig().save();
-        } catch (Exception ignored) {
-        }
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/manager/RequestManager.java

@@ -2,115 +2,138 @@ package cc.carm.plugin.moeteleport.manager;
 
 import cc.carm.plugin.moeteleport.Main;
 import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
-import cc.carm.plugin.moeteleport.model.TeleportRequest;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
-import cc.carm.plugin.moeteleport.model.UserData;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.Objects;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 public class RequestManager {
 
-    public BukkitRunnable checkRunnable;
+    protected final Map<UUID, TeleportRequest> requests = new ConcurrentHashMap<>();
+    protected BukkitRunnable runnable;
 
     public RequestManager(Main main) {
-        this.checkRunnable = new BukkitRunnable() {
+        this.runnable = new BukkitRunnable() {
             @Override
             public void run() {
-                checkRequests();
+                tickRequests();
             }
         };
-        this.checkRunnable.runTaskTimerAsynchronously(main, 100L, 20L);
+        this.runnable.runTaskTimerAsynchronously(main, 100L, 20L);
     }
 
     public void shutdown() {
-        if (!this.checkRunnable.isCancelled()) {
+        if (!this.runnable.isCancelled()) {
-            this.checkRunnable.cancel();
+            this.runnable.cancel();
         }
     }
 
-    public void checkRequests() {
+    @Unmodifiable
-        MoeTeleport.getUserManager().getUserDataMap().values()
+    public Map<UUID, TeleportRequest> getRequests() {
-                .forEach(data -> data.getReceivedRequests().entrySet().stream()
+        return Collections.unmodifiableMap(requests);
-                        .filter(entry -> entry.getValue().isExpired())
-                        .peek(entry -> {
-                            Player sender = entry.getValue().getSender();
-                            Player receiver = entry.getValue().getReceiver();
-                            PluginMessages.Requests.SENT_TIMEOUT.send(sender, receiver.getName());
-                            PluginMessages.Requests.RECEIVED_TIMEOUT.send(receiver, sender.getName());
-                        })
-                        .peek(entry -> MoeTeleport.getUserManager()
-                                .getData(entry.getValue().getSender()).getSentRequests()
-                                .remove(entry.getKey()))
-                        .forEach(entry -> data.getReceivedRequests().remove(entry.getKey()))
-                );
     }
 
-    public void sendRequest(Player sender, Player receiver, TeleportRequest.RequestType type) {
+    public @Nullable TeleportRequest getRequest(UUID senderUUID) {
-        int expireTime = PluginConfig.EXPIRE_TIME.get();
+        return requests.get(senderUUID);
+    }
 
-        PluginMessages.Requests.SENT.send(sender, receiver.getName(), expireTime);
+    @Unmodifiable
+    public @NotNull Map<UUID, TeleportRequest> getUserReceivedRequests(@NotNull UUID receiverUUID) {
+        return requests.values().stream()
+                .filter(request -> request.getReceiver().getUniqueId().equals(receiverUUID))
+                .collect(Collectors.toMap(request -> request.getSender().getUniqueId(), request -> request));
+    }
 
+    public void tickRequests() {
+        Iterator<Map.Entry<UUID, TeleportRequest>> requestIterator = requests.entrySet().iterator();
+        while (requestIterator.hasNext()) {
+            Map.Entry<UUID, TeleportRequest> entry = requestIterator.next();
+            TeleportRequest request = entry.getValue();
+            if (!request.isExpired()) continue;
+
+            requestIterator.remove(); // 移除过期的请求
+
+            // 发送提示
+            PluginMessages.REQUESTS.SENT_TIMEOUT.send(request.getSender(), request.getReceiver().getName());
+            PluginMessages.REQUESTS.RECEIVED_TIMEOUT.send(request.getReceiver(), request.getSender().getName());
+        }
+    }
+
+    public void sendRequest(Player sender, Player receiver, TeleportRequest.Type type) {
+        int expireTime = PluginConfig.REQUEST.EXPIRE_TIME.getNotNull();
+
+        PluginConfig.REQUEST.SOUND.SENT.playTo(sender);
+        PluginConfig.REQUEST.SOUND.RECEIVED.playTo(receiver);
+
+        PluginMessages.REQUESTS.SENT.send(sender, receiver.getName(), expireTime);
         switch (type) {
-            case TPA: {
+            case TPA_TO: {
-                PluginMessages.Requests.RECEIVED_TP_HERE.send(receiver, sender.getName(), expireTime);
+                PluginMessages.REQUESTS.RECEIVED_TP_HERE.send(receiver, sender.getName(), expireTime);
                 break;
             }
             case TPA_HERE: {
-                PluginMessages.Requests.RECEIVED_TP_TO.send(receiver, sender.getName(), expireTime);
+                PluginMessages.REQUESTS.RECEIVED_TP_TO.send(receiver, sender.getName(), expireTime);
                 break;
             }
         }
 
-        TeleportRequest request = new TeleportRequest(sender, receiver, type);
+        requests.put(sender.getUniqueId(), new TeleportRequest(type, sender, receiver));
-        MoeTeleport.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
-        MoeTeleport.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
-
     }
 
     public void acceptRequest(TeleportRequest request) {
-        PluginMessages.Requests.WAS_ACCEPTED.send(request.getSender(), request.getReceiver().getName());
+        PluginMessages.REQUESTS.WAS_ACCEPTED.send(request.getSender(), request.getReceiver().getName());
-        PluginMessages.Requests.ACCEPTED.send(request.getReceiver(), request.getSender().getName());
+        PluginMessages.REQUESTS.ACCEPTED.send(request.getReceiver(), request.getSender().getName());
-        TeleportManager.teleport(request.getTeleportPlayer(), request.getTeleportLocation(), true);
+
         removeRequests(request);
+        MoeTeleport.getTeleportManager().queueTeleport(request.createQueue(
+                Duration.of(PluginConfig.TELEPORTATION.WAIT_TIME.getNotNull(), ChronoUnit.SECONDS)
+        ));
+    }
+
+    public void cancelRequest(TeleportRequest request) {
+        PluginMessages.REQUESTS.WAS_ACCEPTED.send(request.getSender(), request.getReceiver().getName());
+        PluginMessages.REQUESTS.ACCEPTED.send(request.getReceiver(), request.getSender().getName());
+        PluginConfig.REQUEST.SOUND.CANCELLED.playTo(request.getSender());
+        PluginConfig.REQUEST.SOUND.CANCELLED.playTo(request.getReceiver());
+        removeRequests(request);
+        MoeTeleport.getTeleportManager().queueTeleport(request);
     }
 
     public void denyRequest(TeleportRequest request) {
-        PluginMessages.Requests.WAS_DENIED.send(request.getSender(), request.getReceiver().getName());
+        PluginMessages.REQUESTS.WAS_DENIED.send(request.getSender(), request.getReceiver().getName());
-        PluginMessages.Requests.DENIED.send(request.getReceiver(), request.getSender().getName());
+        PluginMessages.REQUESTS.DENIED.send(request.getReceiver(), request.getSender().getName());
         removeRequests(request);
     }
 
     public void removeRequests(TeleportRequest request) {
-        MoeTeleport.getUserManager().getData(request.getSender())
+        this.requests.remove(request.getSender().getUniqueId());
-                .getSentRequests()
-                .remove(request.getReceiver().getUniqueId());
-        MoeTeleport.getUserManager().getData(request.getReceiver())
-                .getReceivedRequests()
-                .remove(request.getSender().getUniqueId());
     }
 
     public void cancelAllRequests(Player player) {
         UUID playerUUID = player.getUniqueId();
-        UserData data = MoeTeleport.getUserManager().getData(player);
-        data.getReceivedRequests().keySet().stream()
-                .peek(senderUUID -> PluginMessages.Requests.OFFLINE.send(Bukkit.getPlayer(senderUUID), player.getName()))
-                .map(senderUUID -> MoeTeleport.getUserManager().getData(senderUUID))
-                .filter(Objects::nonNull).map(UserData::getSentRequests)
-                .forEach(receivers -> receivers.remove(playerUUID));
 
-        data.getSentRequests().stream()
+        TeleportRequest sent = requests.remove(playerUUID);
-                .peek(receiverUUID -> PluginMessages.Requests.OFFLINE.send(Bukkit.getPlayer(receiverUUID), player.getName()))
+        if (sent != null) {
-                .map(receiverUUID -> MoeTeleport.getUserManager().getData(receiverUUID))
+            PluginMessages.REQUESTS.OFFLINE.send(sent.getReceiver(), player.getName());
-                .filter(Objects::nonNull).map(UserData::getReceivedRequests)
+        }
-                .forEach(senders -> senders.remove(playerUUID));
 
-        data.getSentRequests().clear();
+        for (TeleportRequest received : getUserReceivedRequests(playerUUID).values()) {
-        data.getReceivedRequests().clear();
+            PluginMessages.REQUESTS.OFFLINE.send(received.getSender(), player.getName());
+            removeRequests(received);
+        }
     }
 
 }

src/main/java/cc/carm/plugin/moeteleport/manager/TeleportManager.java

@@ -1,51 +1,151 @@
 package cc.carm.plugin.moeteleport.manager;
 
-import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
+import cc.carm.plugin.moeteleport.conf.PluginMessages;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
+import cc.carm.plugin.moeteleport.teleport.TeleportQueue;
+import cc.carm.plugin.moeteleport.teleport.TeleportRequest;
+import cc.carm.plugin.moeteleport.teleport.target.TeleportLocationTarget;
+import cc.carm.plugin.moeteleport.teleport.target.TeleportTarget;
 import org.bukkit.Location;
-import org.bukkit.block.Block;
+import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.jetbrains.annotations.Nullable;
+import xyz.xenondevs.particle.ParticleBuilder;
+import xyz.xenondevs.particle.ParticleEffect;
+import xyz.xenondevs.particle.data.texture.ItemTexture;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class TeleportManager {
 
-    public static void teleport(Player player, DataLocation targetLocation, boolean onlySafety) {
+    protected final Map<UUID, TeleportQueue> teleportQueue = new ConcurrentHashMap<>();
-        Location location = targetLocation.getBukkitLocation();
+    protected BukkitRunnable runnable;
-        if (location == null) {
-            PluginMessages.Teleport.NOT_AVAILABLE.send(player, targetLocation.toFlatString());
-        } else {
-            teleport(player, location, onlySafety);
-        }
-    }
 
-    public static void teleport(Player player, Location targetLocation, boolean onlySafety) {
+    public TeleportManager(Main main) {
-        if (targetLocation.isWorldLoaded()) {
+        this.runnable = new BukkitRunnable() {
-            if (!onlySafety || TeleportManager.isSafeLocation(targetLocation)) {
+            @Override
-                MoeTeleport.getUserManager().getData(player).setLastLocation(player.getLocation());
+            public void run() {
-                player.teleport(targetLocation);
+                tickQueue();
-                PluginMessages.Teleport.TELEPORTING.send(player, new DataLocation(targetLocation).toFlatString());
-            } else {
-                PluginMessages.Teleport.NOT_SAFE.send(player, new DataLocation(targetLocation).toFlatString());
             }
+        };
+        this.runnable.runTaskTimerAsynchronously(main, 20L, 20L);
+    }
+
+    public void shutdown() {
+        if (!this.runnable.isCancelled()) {
+            this.runnable.cancel();
+        }
+    }
+
+    public void tickQueue() {
+        boolean enableEffect = PluginConfig.TELEPORTATION.EFFECTS.getNotNull();
+
+        Iterator<Map.Entry<UUID, TeleportQueue>> queueIterator = teleportQueue.entrySet().iterator();
+        while (queueIterator.hasNext()) {
+            Map.Entry<UUID, TeleportQueue> entry = queueIterator.next();
+            TeleportQueue queue = entry.getValue();
+            if (!queue.checkTime()) {
+                PluginConfig.TELEPORTATION.SOUND.CHANNELING.playTo(queue.getPlayer());
+                PluginConfig.TELEPORTATION.TITLE.CHANNELING.send(
+                        queue.getPlayer(),
+                        queue.getRemainSeconds() + 1, queue.getTarget().getText()
+                );
+
+                if (enableEffect) {
+                    new ParticleBuilder(ParticleEffect.PORTAL, queue.getPlayer().getLocation())
+                            .setAmount(100).setOffsetY(1F).display();
+                }
+
+                continue;
+            }
+
+            queueIterator.remove();
+            executeTeleport(queue);
+        }
+    }
+
+    public void interruptQueue(TeleportQueue queue) {
+        teleportQueue.remove(queue.getPlayer().getUniqueId());
+        PluginMessages.TELEPORT.INTERRUPTED.send(queue.getPlayer());
+        PluginConfig.TELEPORTATION.SOUND.INTERRUPTED.playTo(queue.getPlayer());
+    }
+
+    public TeleportQueue getQueue(UUID uuid) {
+        return teleportQueue.get(uuid);
+    }
+
+    public TeleportQueue getQueue(Player player) {
+        return getQueue(player.getUniqueId());
+    }
+
+    public boolean isChanneling(UUID uuid) {
+        return teleportQueue.containsKey(uuid);
+    }
+
+    public boolean isChanneling(Player player) {
+        return isChanneling(player.getUniqueId());
+    }
+
+    public @Nullable Duration getDelayDuration() {
+        return Duration.of(PluginConfig.TELEPORTATION.WAIT_TIME.getNotNull(), ChronoUnit.SECONDS);
+    }
+
+    public void queueTeleport(@Nullable TeleportQueue queue) {
+        if (queue == null) return;
+        if (queue.checkTime()) { // 直接满足传送条件
+            executeTeleport(queue);
+            return;
+        }
+        teleportQueue.put(queue.getPlayer().getUniqueId(), queue);
+    }
+
+    public void queueTeleport(TeleportRequest request) {
+        queueTeleport(request.createQueue(getDelayDuration()));
+    }
+
+    public void queueTeleport(Player player, TeleportTarget target) {
+        queueTeleport(new TeleportQueue(player, target, getDelayDuration()));
+    }
+
+    public void queueTeleport(Player player, DataLocation target) {
+        queueTeleport(player, new TeleportLocationTarget(target));
+    }
+
+    public void queueTeleport(Player player, Location target) {
+        queueTeleport(player, new TeleportLocationTarget(target));
+    }
+
+    protected void executeTeleport(TeleportQueue queue) {
+        Player player = queue.getPlayer();
+        queue.getUser().setLastLocation(player.getLocation());
+
+        Location location = queue.getTarget().prepare();
+        if (location == null) {
+            PluginMessages.TELEPORT.NOT_AVAILABLE.send(player, queue.getTarget().getText());
+            PluginConfig.TELEPORTATION.SOUND.FAILED.playTo(player);
         } else {
-            PluginMessages.Teleport.NOT_SAFE.send(player, new DataLocation(targetLocation).toFlatString());
+            PluginMessages.TELEPORT.TELEPORTED.send(player, queue.getTarget().getText());
+            PluginConfig.TELEPORTATION.TITLE.TELEPORTED.send(player, queue.getTarget().getText());
+            Main.getInstance().getScheduler().run(() -> {
+                player.teleport(location);
+                PluginConfig.TELEPORTATION.SOUND.TELEPORTED.playTo(player);
+            });
+
+
+            if (PluginConfig.TELEPORTATION.EFFECTS.getNotNull()) {
+                new ParticleBuilder(ParticleEffect.ITEM_CRACK, location)
+                        .setParticleData(new ItemTexture(new ItemStack(Material.ENDER_EYE)))
+                        .setAmount(1).setOffsetY(1F).display();
+            }
         }
     }
-
-    public static boolean isSafeLocation(Location location) {
-        Block leg = location.getBlock();
-        if (!leg.getType().isAir()) {
-            return false; // not transparent (will suffocate)
-        }
-        Block head = leg.getRelative(BlockFace.UP);
-        if (!head.getType().isAir()) {
-            return false; // not transparent (will suffocate)
-        }
-        Block ground = leg.getRelative(BlockFace.DOWN);
-        return !PluginConfig.DANGEROUS_TYPES.get().contains(ground.getType().name());
-    }
-
-
 }

src/main/java/cc/carm/plugin/moeteleport/manager/UserManager.java

@@ -2,10 +2,10 @@ package cc.carm.plugin.moeteleport.manager;
 
 import cc.carm.plugin.moeteleport.Main;
 import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.PluginConfig;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
-import cc.carm.plugin.moeteleport.model.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import cc.carm.plugin.moeteleport.util.DataTaskRunner;
 import com.google.common.collect.ImmutableMap;
 import org.bukkit.Bukkit;
@@ -58,8 +58,8 @@ public class UserManager {
 
             return data;
         } catch (Exception e) {
-            Main.serve("无法正常读取玩家数据，玩家操作将不会被保存，请检查数据配置！");
+            Main.severe("无法正常读取玩家数据，玩家操作将不会被保存，请检查数据配置！");
-            Main.serve("Could not load user's data, please check the data configuration!");
+            Main.severe("Could not load user's data, please check the data configuration!");
             e.printStackTrace();
             return new UserData(userUUID);
         }
@@ -77,8 +77,8 @@ public class UserManager {
                     "耗时 " + (System.currentTimeMillis() - start) + "ms。");
 
         } catch (Exception e) {
-            Main.serve("无法正常保存玩家数据，请检查数据配置！");
+            Main.severe("无法正常保存玩家数据，请检查数据配置！");
-            Main.serve("Could not save user's data, please check the data configuration!");
+            Main.severe("Could not save user's data, please check the data configuration!");
             e.printStackTrace();
         }
     }
@@ -132,19 +132,19 @@ public class UserManager {
     }
 
     public int getMaxHome(Player player) {
-        return getMaxValue(player, PluginConfig.HOME_PERMISSIONS.get(), PluginConfig.DEFAULT_HOME.get());
+        return getMaxValue(player, PluginConfig.HOMES.PERMISSIONS.getNotNull(), PluginConfig.HOMES.DEFAULTS.getNotNull());
     }
 
     public int getMaxWarps(Player player) {
-        return getMaxValue(player, PluginConfig.WARP_PERMISSIONS.get(), PluginConfig.DEFAULT_WARP.get());
+        return getMaxValue(player, PluginConfig.WARPS.PERMISSIONS.getNotNull(), PluginConfig.WARPS.DEFAULTS.getNotNull());
     }
 
     public void editData(@NotNull DataTaskRunner task) {
         try {
             task.run(MoeTeleport.getStorage());
         } catch (Exception exception) {
-            Main.serve("无法正常更改玩家数据，请检查数据配置！");
+            Main.severe("无法正常更改玩家数据，请检查数据配置！");
-            Main.serve("Could not edit user's data, please check the data configuration!");
+            Main.severe("Could not edit user's data, please check the data configuration!");
             exception.printStackTrace();
         }
     }

src/main/java/cc/carm/plugin/moeteleport/manager/WarpManager.java

@@ -2,7 +2,7 @@ package cc.carm.plugin.moeteleport.manager;
 
 import cc.carm.plugin.moeteleport.Main;
 import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import com.google.common.collect.ImmutableMap;
 import org.bukkit.Location;
@@ -19,7 +19,7 @@ public class WarpManager {
         try {
             MoeTeleport.getStorage().saveWarps();
         } catch (Exception exception) {
-            Main.serve("保存地标数据失败，请检查配置文件。");
+            Main.severe("保存地标数据失败，请检查配置文件。");
             exception.printStackTrace();
         }
     }
@@ -33,7 +33,7 @@ public class WarpManager {
         try {
             MoeTeleport.getStorage().setWarp(name, new WarpInfo(name,owner, location));
         } catch (Exception exception) {
-            Main.serve("保存地标数据 " + name + " 失败，请检查配置文件。");
+            Main.severe("保存地标数据 " + name + " 失败，请检查配置文件。");
             exception.printStackTrace();
         }
 
@@ -51,7 +51,7 @@ public class WarpManager {
         try {
             MoeTeleport.getStorage().delWarp(name);
         } catch (Exception exception) {
-            Main.serve("删除地标数据 " + name + " 失败，请检查配置文件。");
+            Main.severe("删除地标数据 " + name + " 失败，请检查配置文件。");
             exception.printStackTrace();
         }
     }

src/main/java/cc/carm/plugin/moeteleport/model/TeleportRequest.java

@@ -1,71 +0,0 @@
-package cc.carm.plugin.moeteleport.model;
-
-import cc.carm.plugin.moeteleport.configuration.PluginConfig;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class TeleportRequest {
-
-    final @NotNull Player sender;
-    final @NotNull Player receiver;
-    final @NotNull RequestType type;
-
-    final long createTime;
-
-    public TeleportRequest(@NotNull Player sender,
-                           @NotNull Player receiver,
-                           @NotNull RequestType type) {
-        this.sender = sender;
-        this.receiver = receiver;
-        this.type = type;
-        this.createTime = System.currentTimeMillis();
-    }
-
-    public @NotNull Player getSender() {
-        return sender;
-    }
-
-    public @NotNull Player getReceiver() {
-        return receiver;
-    }
-
-    public @NotNull Player getTeleportPlayer() {
-        return getType() == RequestType.TPA ? getSender() : getReceiver();
-    }
-
-    public @NotNull Location getTeleportLocation() {
-        return getType() == RequestType.TPA_HERE ? getSender().getLocation() : getReceiver().getLocation();
-    }
-
-    public @NotNull RequestType getType() {
-        return type;
-    }
-
-    public long getCreateTime() {
-        return createTime;
-    }
-
-    public long getActiveTime() {
-        return System.currentTimeMillis() - getCreateTime();
-    }
-
-    public long getRemainTime() {
-        return PluginConfig.EXPIRE_TIME.get() * 1000 - getActiveTime();
-    }
-
-    public long getRemainSeconds() {
-        return getRemainTime() / 1000;
-    }
-
-    public boolean isExpired() {
-        return getActiveTime() > PluginConfig.EXPIRE_TIME.get() * 1000;
-    }
-
-    public enum RequestType {
-        TPA,
-        TPA_HERE
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/model/WarpInfo.java

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.model;
 
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;

src/main/java/cc/carm/plugin/moeteleport/storage/DataSerializer.java

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.storage;
 
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import org.bukkit.Location;
 import org.jetbrains.annotations.Nullable;

src/main/java/cc/carm/plugin/moeteleport/storage/DataStorage.java

@@ -1,8 +1,7 @@
 package cc.carm.plugin.moeteleport.storage;
 
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
 import cc.carm.plugin.moeteleport.manager.UserManager;
-import cc.carm.plugin.moeteleport.model.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -15,9 +14,9 @@ public interface DataStorage {
     /**
      * 在插件加载存储源时执行。
      *
-     * @return 是否初始化成功
+     * @throws Exception 当出现任何错误时抛出
      */
-    boolean initialize();
+    void initialize() throws Exception;
 
     /**
      * 在插件被卸载时执行。

src/main/java/cc/carm/plugin/moeteleport/storage/StorageMethod.java

@@ -2,6 +2,7 @@ package cc.carm.plugin.moeteleport.storage;
 
 import cc.carm.plugin.moeteleport.storage.custom.CustomStorage;
 import cc.carm.plugin.moeteleport.storage.database.MySQLStorage;
+import cc.carm.plugin.moeteleport.storage.extension.CMIStorage;
 import cc.carm.plugin.moeteleport.storage.extension.EssentialStorage;
 import cc.carm.plugin.moeteleport.storage.file.JSONStorage;
 import cc.carm.plugin.moeteleport.storage.file.YAMLStorage;
@@ -10,25 +11,25 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 public enum StorageMethod {
 
-    CUSTOM(0, new String[]{}, CustomStorage::new),
+    CUSTOM(0, new String[]{}, CustomStorage.class),
-    YAML(1, new String[]{"yml"}, YAMLStorage::new),
+    YAML(1, new String[]{"yml"}, YAMLStorage.class),
-    JSON(2, new String[]{}, JSONStorage::new),
+    JSON(2, new String[]{}, JSONStorage.class),
-    MYSQL(3, new String[]{"my-sql", "mariadb", "sql", "database"}, MySQLStorage::new),
+    MYSQL(3, new String[]{"my-sql", "mariadb", "sql", "database"}, MySQLStorage.class),
 
-    ESSENTIALS(11, new String[]{"essential", "ess", "EssentialsX", "essX"}, EssentialStorage::new);
+    ESSENTIALS(11, new String[]{"essential", "ess", "EssentialsX", "essX"}, EssentialStorage.class),
+    CMI(12, new String[]{}, CMIStorage.class);
 
     private final int id;
     private final String[] alias;
-    private @NotNull Supplier<@NotNull DataStorage> storageSupplier;
+    private @NotNull Class<? extends DataStorage> storageClazz;
 
-    StorageMethod(int id, String[] alias, @NotNull Supplier<@NotNull DataStorage> storageSupplier) {
+    StorageMethod(int id, String[] alias, @NotNull Class<? extends DataStorage> storageClazz) {
         this.id = id;
         this.alias = alias;
-        this.storageSupplier = storageSupplier;
+        this.storageClazz = storageClazz;
     }
 
     public static @NotNull StorageMethod read(String s) {
@@ -65,15 +66,15 @@ public enum StorageMethod {
         return alias;
     }
 
-    public @NotNull Supplier<@NotNull DataStorage> getStorageSupplier() {
+    public @NotNull Class<? extends DataStorage> getStorageClazz() {
-        return storageSupplier;
+        return storageClazz;
     }
 
-    public void setStorageSupplier(@NotNull Supplier<@NotNull DataStorage> storageSupplier) {
+    public void setStorageClazz(@NotNull Class<? extends DataStorage> storageClazz) {
-        this.storageSupplier = storageSupplier;
+        this.storageClazz = storageClazz;
     }
 
-    public @NotNull DataStorage createStorage() {
+    public @NotNull DataStorage createStorage() throws Exception {
-        return getStorageSupplier().get();
+        return getStorageClazz().newInstance();
     }
 }

src/main/java/cc/carm/plugin/moeteleport/storage/UserData.java

@@ -1,20 +1,18 @@
-package cc.carm.plugin.moeteleport.model;
+package cc.carm.plugin.moeteleport.storage;
 
 import cc.carm.plugin.moeteleport.MoeTeleport;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
 import org.bukkit.Location;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class UserData {
 
     protected final @NotNull UUID userUUID;
     private final LinkedHashMap<String, DataLocation> homeLocations;
-    private final HashSet<UUID/*receiverUUID*/> sentRequests = new HashSet<>(); // 记录发出的请求
+
-    private final ConcurrentHashMap<UUID/*senderUUID*/, TeleportRequest> receivedRequests = new ConcurrentHashMap<>(); // 记录收到的传送请求
     public boolean enableAutoSelect = false;
     private @Nullable Location lastLocation;
 
@@ -73,14 +71,6 @@ public class UserData {
         this.lastLocation = lastLocation;
     }
 
-    public HashSet<UUID> getSentRequests() {
-        return sentRequests;
-    }
-
-    public ConcurrentHashMap<UUID, TeleportRequest> getReceivedRequests() {
-        return receivedRequests;
-    }
-
     public boolean isEnableAutoSelect() {
         return enableAutoSelect;
     }

src/main/java/cc/carm/plugin/moeteleport/storage/custom/CustomStorage.java

@@ -1,8 +1,8 @@
 package cc.carm.plugin.moeteleport.storage.custom;
 
 import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
 import org.jetbrains.annotations.NotNull;
@@ -17,10 +17,10 @@ public class CustomStorage implements DataStorage {
 
     @Override
     @TestOnly
-    public boolean initialize() {
+    public void initialize() throws UnsupportedOperationException {
-        Main.serve("您选择使用自定义存储，但并没有应用成功。");
+        Main.severe("您选择使用自定义存储，但并没有应用成功。");
-        Main.serve("You are using CustomStorage, but not overwrite the methods.");
+        Main.severe("You are using CustomStorage, but not overwrite the methods.");
-        return false;
+        throw new UnsupportedOperationException("您选择使用自定义存储，但并没有应用成功。");
     }
 
     @Override
@@ -31,14 +31,14 @@ public class CustomStorage implements DataStorage {
 
     @Override
     @TestOnly
-    public @Nullable UserData loadData(@NotNull UUID uuid) {
+    public @Nullable UserData loadData(@NotNull UUID uuid) throws UnsupportedOperationException {
-        return null;
+        throw new UnsupportedOperationException("您选择使用自定义存储，但并没有应用成功。");
     }
 
     @Override
     @TestOnly
-    public void saveUserData(@NotNull UserData data) {
+    public void saveUserData(@NotNull UserData data) throws UnsupportedOperationException {
-
+        throw new UnsupportedOperationException("您选择使用自定义存储，但并没有应用成功。");
     }
 
     @Override

src/main/java/cc/carm/plugin/moeteleport/storage/database/DBConfiguration.java

@@ -1,37 +0,0 @@
-package cc.carm.plugin.moeteleport.storage.database;
-
-import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
-
-public class DBConfiguration {
-
-    protected static final ConfigValue<String> DRIVER_NAME = new ConfigValue<>(
-            "storage.mysql.driver", String.class,
-            "com.mysql.cj.jdbc.Driver"
-    );
-
-    protected static final ConfigValue<String> HOST = new ConfigValue<>(
-            "storage.mysql.host", String.class,
-            "127.0.0.1"
-    );
-
-    protected static final ConfigValue<Integer> PORT = new ConfigValue<>(
-            "storage.mysql.port", Integer.class,
-            3306
-    );
-
-    protected static final ConfigValue<String> DATABASE = new ConfigValue<>(
-            "storage.mysql.database", String.class,
-            "minecraft"
-    );
-
-    protected static final ConfigValue<String> USERNAME = new ConfigValue<>(
-            "storage.mysql.username", String.class,
-            "root"
-    );
-
-    protected static final ConfigValue<String> PASSWORD = new ConfigValue<>(
-            "storage.mysql.password", String.class,
-            "password"
-    );
-
-}

src/main/java/cc/carm/plugin/moeteleport/storage/database/DBTables.java

@@ -1,73 +0,0 @@
-package cc.carm.plugin.moeteleport.storage.database;
-
-import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
-
-public class DBTables {
-
-    protected static class UserLastLocations {
-
-        protected static final ConfigValue<String> TABLE_NAME = new ConfigValue<>(
-                "storage.mysql.tables.last-location", String.class,
-                "mt_user_last_locations"
-        );
-
-        protected static final String[] TABLE_COLUMNS = new String[]{
-                "`uuid` VARCHAR(36) NOT NULL PRIMARY KEY", // 用户的UUID
-                "`world` VARCHAR(128) NOT NULL",// 最后地址的所在世界
-                "`x` DOUBLE NOT NULL",// 最后地址的X坐标
-                "`y` DOUBLE NOT NULL",// 最后地址的Y坐标
-                "`z` DOUBLE NOT NULL",// 最后地址的Z坐标
-                "`yaw` DOUBLE NOT NULL",// 最后地址的Yaw角度
-                "`pitch` DOUBLE NOT NULL",// 最后地址的Pitch角度
-                "`update` DATETIME NOT NULL " +
-                        "DEFAULT CURRENT_TIMESTAMP " +
-                        "ON UPDATE CURRENT_TIMESTAMP "
-        };
-
-    }
-
-    protected static class UserHomes {
-
-        protected static final ConfigValue<String> TABLE_NAME = new ConfigValue<>(
-                "storage.mysql.tables.home", String.class,
-                "mt_user_homes"
-        );
-
-        protected static final String[] TABLE_COLUMNS = new String[]{
-                "`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY",
-                "`uuid` VARCHAR(36) NOT NULL", // 用户的UUID
-                "`name` VARCHAR(32) NOT NULL",
-                "`world` VARCHAR(128) NOT NULL",
-                "`x` DOUBLE NOT NULL",
-                "`y` DOUBLE NOT NULL",
-                "`z` DOUBLE NOT NULL",
-                "`yaw` DOUBLE NOT NULL",
-                "`pitch` DOUBLE NOT NULL",
-                "INDEX `user`(`uuid`)",
-                "UNIQUE KEY `home`(`uuid`,`name`)"
-        };
-
-    }
-
-    protected static class Warps {
-
-        protected static final ConfigValue<String> TABLE_NAME = new ConfigValue<>(
-                "storage.mysql.tables.warps", String.class,
-                "mt_warps"
-        );
-
-        protected static final String[] TABLE_COLUMNS = new String[]{
-                "`id` INT NOT NULL AUTO_INCREMENT UNIQUE KEY",
-                "`name` VARCHAR(16) PRIMARY KEY NOT NULL", // 传送点名称 不为空且唯一
-                "`owner` VARCHAR(36)", // 用户的UUID
-                "`world` VARCHAR(128) NOT NULL",
-                "`x` DOUBLE NOT NULL",
-                "`y` DOUBLE NOT NULL",
-                "`z` DOUBLE NOT NULL",
-                "`yaw` DOUBLE NOT NULL",
-                "`pitch` DOUBLE NOT NULL"
-        };
-
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/storage/database/DatabaseConfig.java

@@ -0,0 +1,41 @@
+package cc.carm.plugin.moeteleport.storage.database;
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.annotation.ConfigPath;
+import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+
+
+@HeaderComment("选择 database (如mysql) 存储方式时的数据库配置")
+@ConfigPath("storage.database")
+public class DatabaseConfig extends ConfigurationRoot {
+
+    @ConfigPath("driver")
+    protected static final ConfigValue<String> DRIVER_NAME = ConfiguredValue.of(
+            String.class, "com.mysql.jdbc.Driver"
+    );
+
+    protected static final ConfigValue<String> HOST = ConfiguredValue.of(String.class, "127.0.0.1");
+    protected static final ConfigValue<Integer> PORT = ConfiguredValue.of(Integer.class, 3306);
+    protected static final ConfigValue<String> DATABASE = ConfiguredValue.of(String.class, "minecraft");
+    protected static final ConfigValue<String> USERNAME = ConfiguredValue.of(String.class, "root");
+    protected static final ConfigValue<String> PASSWORD = ConfiguredValue.of(String.class, "password");
+    protected static final ConfigValue<String> EXTRA = ConfiguredValue.of(String.class, "?useSSL=false");
+
+    @HeaderComment("插件相关表的名称")
+    public static final class TABLES extends ConfigurationRoot {
+
+        public static final ConfigValue<String> LAST_LOCATION = ConfiguredValue.of(String.class, "mt_last_locations");
+        public static final ConfigValue<String> HOMES = ConfiguredValue.of(String.class, "mt_homes");
+        public static final ConfigValue<String> WARPS = ConfiguredValue.of(String.class, "mt_warps");
+
+    }
+
+    protected static String buildJDBC() {
+        return String.format("jdbc:mysql://%s:%s/%s%s",
+                HOST.getNotNull(), PORT.getNotNull(), DATABASE.getNotNull(), EXTRA.getNotNull()
+        );
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/storage/database/DatabaseTables.java

@@ -0,0 +1,96 @@
+package cc.carm.plugin.moeteleport.storage.database;
+
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLTable;
+import cc.carm.lib.easysql.api.builder.TableCreateBuilder;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.SQLException;
+import java.util.function.Consumer;
+
+public enum DatabaseTables implements SQLTable {
+
+    LAST_LOCATION(DatabaseConfig.TABLES.LAST_LOCATION, (table) -> {
+        table.addColumn("uuid", "CHAR(36) NOT NULL PRIMARY KEY"); // 用户的UUID
+
+        // 坐标世界与位置
+        table.addColumn("world", "VARCHAR(128) NOT NULL");
+        table.addColumn("x", "DOUBLE NOT NULL");
+        table.addColumn("y", "DOUBLE NOT NULL");
+        table.addColumn("z", "DOUBLE NOT NULL");
+        table.addColumn("yaw", "DOUBLE NOT NULL");
+        table.addColumn("pitch", "DOUBLE NOT NULL");
+
+        table.addColumn("update",
+                "DATETIME NOT NULL " +
+                        "DEFAULT CURRENT_TIMESTAMP " +
+                        "ON UPDATE CURRENT_TIMESTAMP"
+        );
+    }),
+
+    HOMES(DatabaseConfig.TABLES.HOMES, (table) -> {
+        table.addAutoIncrementColumn("id", true, true);
+        table.addColumn("uuid", "CHAR(36) NOT NULL");
+        table.addColumn("name", "VARCHAR(32) NOT NULL");
+
+        // 坐标世界与位置
+        table.addColumn("world", "VARCHAR(128) NOT NULL");
+        table.addColumn("x", "DOUBLE NOT NULL");
+        table.addColumn("y", "DOUBLE NOT NULL");
+        table.addColumn("z", "DOUBLE NOT NULL");
+        table.addColumn("yaw", "DOUBLE NOT NULL");
+        table.addColumn("pitch", "DOUBLE NOT NULL");
+
+        table.setIndex(IndexType.INDEX, "idx_homes_user", "uuid");
+        table.setIndex(IndexType.UNIQUE_KEY, "uk_homes", "uuid", "name");
+    }),
+
+    WRAPS(DatabaseConfig.TABLES.WARPS, (table) -> {
+
+        table.addAutoIncrementColumn("id", true, true);
+        table.addColumn("name", "VARCHAR(32) NOT NULL");
+        table.addColumn("owner", "CHAR(36) NOT NULL");
+
+        // 坐标世界与位置
+        table.addColumn("world", "VARCHAR(128) NOT NULL");
+        table.addColumn("x", "DOUBLE NOT NULL");
+        table.addColumn("y", "DOUBLE NOT NULL");
+        table.addColumn("z", "DOUBLE NOT NULL");
+        table.addColumn("yaw", "DOUBLE NOT NULL");
+        table.addColumn("pitch", "DOUBLE NOT NULL");
+
+        table.setIndex(IndexType.UNIQUE_KEY, "uk_wraps", "name");
+    });
+
+    private final Consumer<TableCreateBuilder> builder;
+    private final ConfigValue<String> name;
+    private @Nullable SQLManager manager;
+
+    DatabaseTables(ConfigValue<String> name,
+                   Consumer<TableCreateBuilder> builder) {
+        this.name = name;
+        this.builder = builder;
+    }
+
+    @Override
+    public @Nullable SQLManager getSQLManager() {
+        return this.manager;
+    }
+
+    @Override
+    public @NotNull String getTableName() {
+        return this.name.getNotNull();
+    }
+
+    @Override
+    public boolean create(SQLManager sqlManager) throws SQLException {
+        if (this.manager == null) this.manager = sqlManager;
+
+        TableCreateBuilder tableBuilder = sqlManager.createTable(getTableName());
+        if (builder != null) builder.accept(tableBuilder);
+        return tableBuilder.build().executeFunction(l -> l > 0, false);
+    }
+}

src/main/java/cc/carm/plugin/moeteleport/storage/database/MySQLStorage.java

@@ -4,10 +4,10 @@ import cc.carm.lib.easysql.EasySQL;
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.util.UUIDUtil;
 import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import org.bukkit.Location;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -26,52 +26,37 @@ public class MySQLStorage implements DataStorage {
     Map<String, WarpInfo> warpsMap = new HashMap<>();
 
     @Override
-    public boolean initialize() {
+    public void initialize() throws Exception {
+
+        Main.info("加载数据库配置...");
+        Main.getInstance().getConfigProvider().initialize(DatabaseConfig.class);
+
         try {
             Main.info("	尝试连接到数据库...");
-            String url = String.format("jdbc:mysql://%s:%s/%s?useSSL=false",
-                    DBConfiguration.HOST.get(), DBConfiguration.PORT.get(), DBConfiguration.DATABASE.get()
-            );
             this.sqlManager = EasySQL.createManager(
-                    DBConfiguration.DRIVER_NAME.get(), url,
+                    DatabaseConfig.DRIVER_NAME.getNotNull(), DatabaseConfig.buildJDBC(),
-                    DBConfiguration.USERNAME.get(), DBConfiguration.PASSWORD.get()
+                    DatabaseConfig.USERNAME.getNotNull(), DatabaseConfig.PASSWORD.getNotNull()
             );
             this.sqlManager.setDebugMode(() -> Main.getInstance().isDebugging());
         } catch (Exception exception) {
-            Main.serve("无法连接到数据库，请检查配置文件。");
+            throw new Exception("无法连接到数据库，请检查配置文件", exception);
-            exception.printStackTrace();
-            return false;
         }
 
         try {
             Main.info("	创建插件所需表...");
-            getSQLManager().createTable(DBTables.UserLastLocations.TABLE_NAME.get())
+            for (DatabaseTables value : DatabaseTables.values()) {
-                    .setColumns(DBTables.UserLastLocations.TABLE_COLUMNS)
+                value.create(this.sqlManager);
-                    .build().execute();
+            }
-
-            getSQLManager().createTable(DBTables.UserHomes.TABLE_NAME.get())
-                    .setColumns(DBTables.UserHomes.TABLE_COLUMNS)
-                    .build().execute();
-
-            getSQLManager().createTable(DBTables.Warps.TABLE_NAME.get())
-                    .setColumns(DBTables.Warps.TABLE_COLUMNS)
-                    .build().execute();
-
         } catch (SQLException exception) {
-            Main.serve("无法创建插件所需的表，请检查数据库权限。");
+            throw new Exception("无法创建插件所需的表，请检查数据库权限。", exception);
-            exception.printStackTrace();
-            return false;
         }
 
         Main.info("	加载地标数据...");
         try {
             this.warpsMap = loadWarps();
         } catch (Exception e) {
-            Main.serve("无法加载地标数据，请检查数据库权限和相关表。");
+            throw new Exception("无法加载地标数据，请检查数据库权限和相关表。", e);
-            e.printStackTrace();
         }
-
-        return true;
     }
 
     @Override
@@ -81,6 +66,10 @@ public class MySQLStorage implements DataStorage {
         this.sqlManager = null;
     }
 
+    public SQLManager getSQLManager() {
+        return sqlManager;
+    }
+
     @Override
     public @Nullable UserData loadData(@NotNull UUID uuid) throws Exception {
         LinkedHashMap<String, DataLocation> homes = loadHomes(uuid);
@@ -92,7 +81,7 @@ public class MySQLStorage implements DataStorage {
     public void saveUserData(@NotNull UserData data) throws Exception {
         Location location = data.getLastLocation();
         if (location != null && location.getWorld() != null) {
-            getSQLManager().createReplace(DBTables.UserLastLocations.TABLE_NAME.get())
+            DatabaseTables.LAST_LOCATION.createReplace()
                     .setColumnNames("uuid", "world", "x", "y", "z", "yaw", "pitch")
                     .setParams(
                             data.getUserUUID(), location.getWorld().getName(),
@@ -100,7 +89,7 @@ public class MySQLStorage implements DataStorage {
                             location.getYaw(), location.getPitch()
                     ).execute();
         } else {
-            getSQLManager().createDelete(DBTables.UserLastLocations.TABLE_NAME.get())
+            DatabaseTables.LAST_LOCATION.createDelete()
                     .addCondition("uuid", data.getUserUUID()).setLimit(1)
                     .build().execute();
         }
@@ -117,7 +106,7 @@ public class MySQLStorage implements DataStorage {
     }
 
     private @NotNull LinkedHashMap<String, DataLocation> loadHomes(@NotNull UUID uuid) throws Exception {
-        return getSQLManager().createQuery().inTable(DBTables.UserHomes.TABLE_NAME.get())
+        return DatabaseTables.HOMES.createQuery()
                 .addCondition("uuid", uuid).build()
                 .executeFunction((query) -> {
                     LinkedHashMap<String, DataLocation> homes = new LinkedHashMap<>();
@@ -126,38 +115,24 @@ public class MySQLStorage implements DataStorage {
                     while (resultSet.next()) {
                         String name = resultSet.getString("name");
                         if (name == null) continue;
-                        homes.put(name, new DataLocation(
+                        homes.put(name, readLocation(resultSet));
-                                resultSet.getString("world"),
-                                resultSet.getDouble("x"),
-                                resultSet.getDouble("y"),
-                                resultSet.getDouble("z"),
-                                resultSet.getFloat("yaw"),
-                                resultSet.getFloat("pitch")
-                        ));
                     }
                     return homes;
                 }, new LinkedHashMap<>());
     }
 
     private @Nullable DataLocation loadLastLocation(@NotNull UUID uuid) throws Exception {
-        return getSQLManager().createQuery().inTable(DBTables.UserLastLocations.TABLE_NAME.get())
+        return DatabaseTables.LAST_LOCATION.createQuery()
                 .addCondition("uuid", uuid).setLimit(1).build()
                 .executeFunction((query) -> {
                     ResultSet resultSet = query.getResultSet();
                     if (resultSet == null || !resultSet.next()) return null;
-                    return new DataLocation(
+                    return readLocation(resultSet);
-                            resultSet.getString("world"),
-                            resultSet.getDouble("x"),
-                            resultSet.getDouble("y"),
-                            resultSet.getDouble("z"),
-                            resultSet.getFloat("yaw"),
-                            resultSet.getFloat("pitch")
-                    );
                 });
     }
 
     private @NotNull Map<String, WarpInfo> loadWarps() throws Exception {
-        return getSQLManager().createQuery().inTable(DBTables.Warps.TABLE_NAME.get())
+        return DatabaseTables.WRAPS.createQuery()
                 .orderBy("id", true).build().executeFunction((query) -> {
                     LinkedHashMap<String, WarpInfo> warps = new LinkedHashMap<>();
                     ResultSet resultSet = query.getResultSet();
@@ -166,14 +141,7 @@ public class MySQLStorage implements DataStorage {
                         String uuidString = resultSet.getString("owner");
                         UUID uuid = uuidString == null ? null : UUIDUtil.toUUID(uuidString);
                         String name = resultSet.getString("name");
-                        DataLocation location = new DataLocation(
+                        DataLocation location = readLocation(resultSet);
-                                resultSet.getString("world"),
-                                resultSet.getDouble("x"),
-                                resultSet.getDouble("y"),
-                                resultSet.getDouble("z"),
-                                resultSet.getFloat("yaw"),
-                                resultSet.getFloat("pitch")
-                        );
                         warps.put(name, new WarpInfo(name, uuid, location));
                     }
                     return warps;
@@ -182,7 +150,7 @@ public class MySQLStorage implements DataStorage {
 
     @Override
     public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation location) throws Exception {
-        getSQLManager().createReplace(DBTables.UserHomes.TABLE_NAME.get())
+        DatabaseTables.HOMES.createReplace()
                 .setColumnNames("uuid", "name", "world", "x", "y", "z", "yaw", "pitch")
                 .setParams(
                         uuid, homeName, location.getWorldName(),
@@ -194,7 +162,7 @@ public class MySQLStorage implements DataStorage {
 
     @Override
     public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) throws Exception {
-        return getSQLManager().createDelete(DBTables.UserHomes.TABLE_NAME.get())
+        return DatabaseTables.HOMES.createDelete()
                 .addCondition("uuid", uuid)
                 .addCondition("name", homeName)
                 .setLimit(1)
@@ -205,7 +173,7 @@ public class MySQLStorage implements DataStorage {
     public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) throws Exception {
         this.warpsMap.put(name, warpInfo);
         DataLocation location = warpInfo.getLocation();
-        getSQLManager().createReplace(DBTables.Warps.TABLE_NAME.get())
+        DatabaseTables.WRAPS.createReplace()
                 .setColumnNames("name", "owner", "world", "x", "y", "z", "yaw", "pitch")
                 .setParams(
                         name, warpInfo.getOwner(), location.getWorldName(),
@@ -220,13 +188,20 @@ public class MySQLStorage implements DataStorage {
         if (actualName == null) return false;
 
         this.warpsMap.remove(actualName);
-        return getSQLManager().createDelete(DBTables.Warps.TABLE_NAME.get())
+        return DatabaseTables.WRAPS.createDelete()
                 .addCondition("name", actualName).setLimit(1)
                 .build().executeFunction((i) -> i > 0, false);
     }
 
-    public SQLManager getSQLManager() {
+    protected DataLocation readLocation(ResultSet result) throws SQLException {
-        return sqlManager;
+        return new DataLocation(
+                result.getString("world"),
+                result.getDouble("x"),
+                result.getDouble("y"),
+                result.getDouble("z"),
+                result.getFloat("yaw"),
+                result.getFloat("pitch")
+        );
     }
 
 

src/main/java/cc/carm/plugin/moeteleport/storage/extension/CMIStorage.java

@@ -0,0 +1,124 @@
+package cc.carm.plugin.moeteleport.storage.extension;
+
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import cc.carm.plugin.moeteleport.storage.impl.PluginBasedStorage;
+import com.Zrips.CMI.CMI;
+import com.Zrips.CMI.Containers.CMIUser;
+import com.Zrips.CMI.Modules.Homes.CmiHome;
+import com.Zrips.CMI.Modules.Warps.CmiWarp;
+import com.Zrips.CMI.Modules.Warps.WarpManager;
+import net.Zrips.CMILib.Container.CMILocation;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class CMIStorage extends PluginBasedStorage {
+
+    public CMIStorage() {
+        super("CMI");
+    }
+
+    @Override
+    public @Nullable UserData loadData(@NotNull UUID uuid) {
+        return new CMIUserData(uuid);
+    }
+
+    @Override
+    public Map<String, WarpInfo> getWarps() {
+        Map<String, WarpInfo> warps = new LinkedHashMap<>();
+
+        cmi().getWarps().forEach((name, warp) -> warps.put(name, new WarpInfo(name, warp.getCreator(), convert(warp.getLoc()))));
+
+        return warps;
+    }
+
+    @Override
+    public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) throws Exception {
+        CmiWarp warp = new CmiWarp(name);
+
+        warp.setLoc(convert(warpInfo.getLocation()));
+        warp.setCreator(warpInfo.getOwner());
+
+        cmi().addWarp(warp);
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) throws Exception {
+        CmiWarp warp = cmi().getWarp(name);
+        if (warp == null) return false;
+        cmi().remove(warp);
+        return true;
+    }
+
+    @Override
+    public boolean hasWarp(@NotNull String name) {
+        return cmi().getWarp(name) != null;
+    }
+
+    protected WarpManager cmi() {
+        return CMI.getInstance().getWarpManager();
+    }
+
+    public static DataLocation convert(CMILocation loc) {
+        return new DataLocation(loc.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
+    }
+
+    public static CMILocation convert(DataLocation loc) {
+        return new CMILocation(loc.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
+    }
+
+    public static class CMIUserData extends UserData {
+
+        CMIUser cmiUser;
+
+        public CMIUserData(@NotNull UUID userUUID) {
+            super(userUUID);
+            this.cmiUser = CMI.getInstance().getPlayerManager().getUser(userUUID);
+        }
+
+        public CMIUser getCMIUser() {
+            return cmiUser;
+        }
+
+        @Override
+        public LinkedHashMap<String, DataLocation> getHomeLocations() {
+            LinkedHashMap<String, DataLocation> homes = new LinkedHashMap<>();
+            getCMIUser().getHomes().forEach((name, home) -> {
+                homes.put(name, convert(home.getLoc()));
+            });
+            return homes;
+        }
+
+        @Override
+        public void setHomeLocation(String homeName, Location location) {
+            getCMIUser().addHome(new CmiHome(homeName, new CMILocation(location)), true);
+        }
+
+        @Override
+        public void delHomeLocation(String homeName) {
+            try {
+                getCMIUser().removeHome(homeName);
+            } catch (Exception ignored) {
+            }
+        }
+
+        @Override
+        public @Nullable Location getLastLocation() {
+            return getCMIUser().getLastTeleportLocation();
+        }
+
+        @Override
+        public void setLastLocation(@Nullable Location lastLocation) {
+            getCMIUser().setLastTeleportLocation(lastLocation);
+        }
+
+    }
+
+
+}

src/main/java/cc/carm/plugin/moeteleport/storage/extension/EssentialStorage.java

@@ -1,7 +1,7 @@
 package cc.carm.plugin.moeteleport.storage.extension;
 
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.impl.PluginBasedStorage;
 import com.earth2me.essentials.Essentials;
@@ -16,17 +16,10 @@ import java.util.UUID;
 
 public class EssentialStorage extends PluginBasedStorage {
 
-    private Essentials essentials;
-
     public EssentialStorage() {
         super("Essentials");
     }
 
-    @Override
-    public boolean initialize() {
-        return super.initialize() && (this.essentials = (Essentials) getDependPlugin()) != null;
-    }
-
     @Override
     public @Nullable UserData loadData(@NotNull UUID uuid) {
         return new EssentialUserData(uuid, getEssentials());
@@ -40,7 +33,7 @@ public class EssentialStorage extends PluginBasedStorage {
             try {
                 Location warpLocation = getEssentials().getWarps().getWarp(warpName);
                 UUID owner = getEssentials().getWarps().getLastOwner(warpName);
-                warps.put(warpName, new WarpInfo(warpName,owner, new DataLocation(warpLocation)));
+                warps.put(warpName, new WarpInfo(warpName, owner, new DataLocation(warpLocation)));
             } catch (Exception ignore) {
             }
         }
@@ -74,7 +67,7 @@ public class EssentialStorage extends PluginBasedStorage {
     }
 
     public Essentials getEssentials() {
-        return essentials;
+        return (Essentials) getDependPlugin();
     }
 
     public static class EssentialUserData extends UserData {

src/main/java/cc/carm/plugin/moeteleport/storage/file/JSONStorage.java

@@ -2,8 +2,8 @@ package cc.carm.plugin.moeteleport.storage.file;
 
 import cc.carm.lib.easysql.api.util.UUIDUtil;
 import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataSerializer;
 import cc.carm.plugin.moeteleport.storage.impl.FileBasedStorage;
@@ -30,17 +30,9 @@ public class JSONStorage extends FileBasedStorage {
     Map<String, WarpInfo> warpsMap = new HashMap<>();
 
     @Override
-    public boolean initialize() {
+    public void initialize() throws Exception {
-        if (super.initialize()) {
+        super.initialize();
-            try {
+        this.warpsMap = loadWarps();
-                this.warpsMap = loadWarps();
-                return true;
-            } catch (Exception e) {
-                Main.serve("无法加载地标数据，请检查文件权限和相关配置。");
-                e.printStackTrace();
-            }
-        }
-        return false;
     }
 
     @Override

src/main/java/cc/carm/plugin/moeteleport/storage/file/YAMLStorage.java

@@ -1,8 +1,8 @@
 package cc.carm.plugin.moeteleport.storage.file;
 
 import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataSerializer;
 import cc.carm.plugin.moeteleport.storage.impl.FileBasedStorage;
@@ -26,22 +26,14 @@ public class YAMLStorage extends FileBasedStorage {
     FileConfiguration warpsConfiguration;
 
     @Override
-    public boolean initialize() {
+    public void initialize() throws Exception {
-        if (super.initialize()) {
+        super.initialize();
-            try {
+        this.warpsDataFile = new File(getDataFolder(), "warps.yml");
-                this.warpsDataFile = new File(getDataFolder(), "warps.yml");
+        if (!this.warpsDataFile.exists() && !warpsDataFile.createNewFile()) {
-                if (!this.warpsDataFile.exists()) {
+            throw new Exception("无法创建 warps.yml 文件。");
-                    boolean success = warpsDataFile.createNewFile();
-                }
-                this.warpsConfiguration = YamlConfiguration.loadConfiguration(warpsDataFile);
-                this.warpsMap = loadWarps();
-                return true;
-            } catch (Exception e) {
-                Main.serve("无法加载地标数据，请检查文件权限和相关配置。");
-                e.printStackTrace();
-            }
         }
-        return false;
+        this.warpsConfiguration = YamlConfiguration.loadConfiguration(warpsDataFile);
+        this.warpsMap = loadWarps();
     }
 
     @Override

src/main/java/cc/carm/plugin/moeteleport/storage/impl/FileBasedStorage.java

@@ -1,8 +1,9 @@
 package cc.carm.plugin.moeteleport.storage.impl;
 
-import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
 import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
 import org.jetbrains.annotations.NotNull;
@@ -13,23 +14,31 @@ import java.util.UUID;
 
 public abstract class FileBasedStorage implements DataStorage {
 
-    private static final ConfigValue<String> FILE_PATH = new ConfigValue<>(
+    protected static final ConfigValue<String> FILE_PATH = ConfiguredValue.builder(String.class)
-            "storage.file-path", String.class, "data"
+            .fromString().defaults("data")
-    );
+            .headerComments(
+                    "选择 yaml/json 存储方式时的存储路径",
+                    "默认为相对路径，相对于插件生成的配置文件夹下的路径",
+                    "支持绝对路径，如 “/var/data/moe-teleport/\"(linux) 或 \"D:\\data\\moe-teleport\\\"(windows)",
+                    "使用绝对路径时请注意权限问题"
+            ).build();
 
     protected @Nullable File dataFolder;
 
     @Override
-    public boolean initialize() {
+    public void initialize() throws Exception {
-        try {
+        FILE_PATH.initialize(
-            this.dataFolder = new File(Main.getInstance().getDataFolder(), FILE_PATH.get());
+                Main.getInstance().getConfigProvider(), true,
-            if (!dataFolder.exists()) {
+                "storage.file", null, null
-                return dataFolder.mkdir();
+        );
-            } else {
+
-                return dataFolder.isDirectory();
+        this.dataFolder = new File(Main.getInstance().getDataFolder(), FILE_PATH.getNotNull());
+        if (!dataFolder.exists()) {
+            if (!dataFolder.mkdir()) {
+                throw new Exception("无法创建数据文件夹！");
             }
-        } catch (Exception ex) {
+        } else if (!dataFolder.isDirectory()) {
-            return false;
+            throw new Exception("数据文件夹路径对应的不是一个文件夹！");
         }
     }
 

src/main/java/cc/carm/plugin/moeteleport/storage/impl/PluginBasedStorage.java

@@ -1,7 +1,7 @@
 package cc.carm.plugin.moeteleport.storage.impl;
 
-import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.storage.UserData;
 import cc.carm.plugin.moeteleport.model.WarpInfo;
 import cc.carm.plugin.moeteleport.storage.DataStorage;
 import org.bukkit.Bukkit;
@@ -20,8 +20,10 @@ public abstract class PluginBasedStorage implements DataStorage {
     }
 
     @Override
-    public boolean initialize() {
+    public void initialize() throws NullPointerException {
-        return dependPlugin != null;
+        if (dependPlugin == null) {
+            throw new NullPointerException("该存储类型依赖的插件不存在，请检查配置文件");
+        }
     }
 
     public Plugin getDependPlugin() {

src/main/java/cc/carm/plugin/moeteleport/teleport/TeleportQueue.java

@@ -0,0 +1,55 @@
+package cc.carm.plugin.moeteleport.teleport;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import cc.carm.plugin.moeteleport.teleport.target.TeleportTarget;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Duration;
+
+public class TeleportQueue {
+
+    private final @NotNull Player player;
+    private final @NotNull TeleportTarget target;
+
+    private final long createMillis;
+    private final long executeMillis;
+
+    public TeleportQueue(@NotNull Player player, @NotNull TeleportTarget target, @Nullable Duration delay) {
+        this.player = player;
+        this.target = target;
+        this.createMillis = System.currentTimeMillis();
+        this.executeMillis = delay == null ? 0 : System.currentTimeMillis() + delay.toMillis();
+    }
+
+    public @NotNull Player getPlayer() {
+        return player;
+    }
+
+    public @NotNull UserData getUser() {
+        return MoeTeleport.getUserManager().getData(getPlayer());
+    }
+
+    public @NotNull TeleportTarget getTarget() {
+        return target;
+    }
+
+    public long getCreateMillis() {
+        return createMillis;
+    }
+
+    public long getExecuteMillis() {
+        return executeMillis;
+    }
+
+    public long getRemainSeconds() {
+        return (executeMillis - System.currentTimeMillis()) / 1000;
+    }
+
+    public boolean checkTime() {
+        return System.currentTimeMillis() >= executeMillis;
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/teleport/TeleportRequest.java

@@ -0,0 +1,89 @@
+package cc.carm.plugin.moeteleport.teleport;
+
+import cc.carm.plugin.moeteleport.MoeTeleport;
+import cc.carm.plugin.moeteleport.conf.PluginConfig;
+import cc.carm.plugin.moeteleport.storage.UserData;
+import cc.carm.plugin.moeteleport.teleport.target.TeleportPlayerTarget;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Duration;
+
+public class TeleportRequest {
+
+    public enum Type {TPA_TO, TPA_HERE}
+
+    private final @NotNull Type type;
+
+    private final @NotNull Player sender;
+    private final @NotNull Player receiver;
+
+    private final long createMillis;
+
+    public TeleportRequest(@NotNull Type type, @NotNull Player sender, @NotNull Player receiver) {
+        this.type = type;
+        this.sender = sender;
+        this.receiver = receiver;
+        this.createMillis = System.currentTimeMillis();
+    }
+
+    public @NotNull Type getRequestType() {
+        return type;
+    }
+
+    public @NotNull Player getReceiver() {
+        return receiver;
+    }
+
+    public @NotNull UserData getReceiverUser() {
+        return MoeTeleport.getUserManager().getData(getReceiver());
+    }
+
+    public @NotNull Player getSender() {
+        return sender;
+    }
+
+    public @NotNull UserData getSenderUser() {
+        return MoeTeleport.getUserManager().getData(getSender());
+    }
+
+    public long getCreateMillis() {
+        return createMillis;
+    }
+
+    public long getActiveMillis() {
+        return System.currentTimeMillis() - getCreateMillis();
+    }
+
+    public long getRemainMillis() {
+        return PluginConfig.REQUEST.EXPIRE_TIME.getNotNull() * 1000 - getActiveMillis();
+    }
+
+    public long getRemainSeconds() {
+        return getRemainMillis() / 1000;
+    }
+
+    public boolean isExpired() {
+        return getActiveMillis() > PluginConfig.REQUEST.EXPIRE_TIME.getNotNull() * 1000;
+    }
+
+    public @Nullable TeleportQueue createQueue(@Nullable Duration delay) {
+        Player player;
+        TeleportPlayerTarget destination;
+
+        if (type == Type.TPA_TO) {
+            destination = new TeleportPlayerTarget(receiver);
+            player = sender;
+        } else if (type == Type.TPA_HERE) {
+            destination = new TeleportPlayerTarget(sender);
+            player = receiver;
+        } else {
+            return null;
+        }
+
+        return new TeleportQueue(player, destination, delay);
+    }
+
+
+}

src/main/java/cc/carm/plugin/moeteleport/teleport/target/TeleportLocationTarget.java

@@ -0,0 +1,39 @@
+package cc.carm.plugin.moeteleport.teleport.target;
+
+import cc.carm.plugin.moeteleport.conf.location.DataLocation;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class TeleportLocationTarget implements TeleportTarget {
+
+    private final @NotNull DataLocation location;
+
+    public TeleportLocationTarget(@NotNull DataLocation location) {
+        this.location = location;
+    }
+
+    public TeleportLocationTarget(@NotNull Location location) {
+        this(new DataLocation(location));
+    }
+
+    public @NotNull DataLocation getDataLocation() {
+        return location;
+    }
+
+    public @Nullable Location getLocation() {
+        return getDataLocation().getBukkitLocation();
+    }
+
+    @Override
+    public Location prepare() {
+        Location loc = getLocation();
+        if (loc == null || !loc.isWorldLoaded()) return null;
+        return loc;
+    }
+
+    @Override
+    public String getText() {
+        return getDataLocation().toFlatString();
+    }
+}

src/main/java/cc/carm/plugin/moeteleport/teleport/target/TeleportPlayerTarget.java

@@ -0,0 +1,25 @@
+package cc.carm.plugin.moeteleport.teleport.target;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class TeleportPlayerTarget implements TeleportTarget {
+
+    protected final @NotNull Player target;
+
+    public TeleportPlayerTarget(@NotNull Player target) {
+        this.target = target;
+    }
+
+    @Override
+    public Location prepare() {
+        return target.isOnline() ? target.getLocation() : null;
+    }
+
+    @Override
+    public String getText() {
+        return target.getName();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/teleport/target/TeleportTarget.java

@@ -0,0 +1,43 @@
+package cc.carm.plugin.moeteleport.teleport.target;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.jetbrains.annotations.Nullable;
+
+public interface TeleportTarget {
+
+    /**
+     * 准备可传送的目的地
+     *
+     * @return 准备传送目的地
+     */
+    @Nullable Location prepare();
+
+    /**
+     * @return 目标的文字介绍
+     */
+    String getText();
+
+    /**
+     * 检查一个位置是否安全
+     *
+     * @param location 位置
+     * @return 是否安全
+     */
+    @Deprecated
+    static boolean checkLocation(Location location) {
+        Block leg = location.getBlock();
+        if (!leg.getType().isAir()) {
+            return false; // not transparent (will suffocate)
+        }
+        Block head = leg.getRelative(BlockFace.UP);
+        if (!head.getType().isAir()) {
+            return false; // not transparent (will suffocate)
+        }
+        Block ground = leg.getRelative(BlockFace.DOWN);
+//        return !PluginConfig.TELEPORTATION.DANGEROUS_TYPES.getNotNull().contains(ground.getType().name());
+        return !ground.isPassable();
+    }
+
+}

src/main/java/cc/carm/plugin/moeteleport/util/ColorParser.java

@@ -1,31 +0,0 @@
-package cc.carm.plugin.moeteleport.util;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ColorParser {
-
-    public static String parse(String text) {
-        return parseColor(parseHexColor(text));
-    }
-
-    public static String parseColor(final String text) {
-        return text.replaceAll("&", "§").replace("§§", "&");
-    }
-
-    public static String parseHexColor(String text) {
-        Pattern pattern = Pattern.compile("&\\((&?#[0-9a-fA-F]{6})\\)");
-        Matcher matcher = pattern.matcher(text);
-        while (matcher.find()) {
-            String hexColor = text.substring(matcher.start() + 2, matcher.end() - 1);
-            hexColor = hexColor.replace("&", "");
-            StringBuilder bukkitColorCode = new StringBuilder('§' + "x");
-            for (int i = 1; i < hexColor.length(); i++) {
-                bukkitColorCode.append('§').append(hexColor.charAt(i));
-            }
-            text = text.replaceAll("&\\(" + hexColor + "\\)", bukkitColorCode.toString().toLowerCase());
-            matcher.reset(text);
-        }
-        return text;
-    }
-}

src/main/java/cc/carm/plugin/moeteleport/util/JarResourceUtils.java

@@ -1,105 +0,0 @@
-package cc.carm.plugin.moeteleport.util;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-@SuppressWarnings("ResultOfMethodCallIgnored")
-public class JarResourceUtils {
-    public static final char JAR_SEPARATOR = '/';
-
-    public static @Nullable String[] readResource(@Nullable InputStream resourceStream) {
-        if (resourceStream == null) return null;
-        try (Scanner scanner = new Scanner(resourceStream, "UTF-8")) {
-            List<String> contents = new ArrayList<>();
-            while (scanner.hasNextLine()) {
-                contents.add(scanner.nextLine());
-            }
-            return contents.toArray(new String[0]);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public static void copyFolderFromJar(String folderName, File destFolder, CopyOption option)
-            throws IOException {
-        copyFolderFromJar(folderName, destFolder, option, null);
-    }
-
-    public static void copyFolderFromJar(String folderName, File destFolder,
-                                         CopyOption option, PathTrimmer trimmer) throws IOException {
-        if (!destFolder.exists())
-            destFolder.mkdirs();
-
-        byte[] buffer = new byte[1024];
-
-        File fullPath;
-        String path = JarResourceUtils.class.getProtectionDomain().getCodeSource().getLocation().getPath();
-        if (trimmer != null)
-            path = trimmer.trim(path);
-        try {
-            if (!path.startsWith("file"))
-                path = "file://" + path;
-
-            fullPath = new File(new URI(path));
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-            return;
-        }
-
-        ZipInputStream zis = new ZipInputStream(new FileInputStream(fullPath));
-
-        ZipEntry entry;
-        while ((entry = zis.getNextEntry()) != null) {
-            if (!entry.getName().startsWith(folderName + JAR_SEPARATOR))
-                continue;
-
-            String fileName = entry.getName();
-
-            if (fileName.charAt(fileName.length() - 1) == JAR_SEPARATOR) {
-                File file = new File(destFolder + File.separator + fileName);
-                if (file.isFile()) {
-                    file.delete();
-                }
-                file.mkdirs();
-                continue;
-            }
-
-            File file = new File(destFolder + File.separator + fileName);
-            if (option == CopyOption.COPY_IF_NOT_EXIST && file.exists())
-                continue;
-
-            if (!file.getParentFile().exists())
-                file.getParentFile().mkdirs();
-
-            if (!file.exists())
-                file.createNewFile();
-            FileOutputStream fos = new FileOutputStream(file);
-
-            int len;
-            while ((len = zis.read(buffer)) > 0) {
-                fos.write(buffer, 0, len);
-            }
-            fos.close();
-        }
-
-        zis.closeEntry();
-        zis.close();
-    }
-
-    public enum CopyOption {
-        COPY_IF_NOT_EXIST, REPLACE_IF_EXIST
-    }
-
-    @FunctionalInterface
-    public interface PathTrimmer {
-        String trim(String original);
-    }
-}

src/main/java/cc/carm/plugin/moeteleport/util/MessageUtil.java

@@ -1,77 +0,0 @@
-package cc.carm.plugin.moeteleport.util;
-
-import de.themoep.minedown.MineDown;
-import me.clip.placeholderapi.PlaceholderAPI;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-public class MessageUtil {
-
-    public static boolean hasPlaceholderAPI() {
-        return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
-    }
-
-    public static void send(@Nullable CommandSender sender, List<String> messages) {
-        if (messages == null || messages.isEmpty() || sender == null) return;
-        for (String s : messages) {
-            sender.spigot().sendMessage(MineDown.parse(s));
-        }
-    }
-
-    public static void send(@Nullable CommandSender sender, String... messages) {
-        send(sender, Arrays.asList(messages));
-    }
-
-    public static void sendWithPlaceholders(CommandSender sender, String... messages) {
-        sendWithPlaceholders(sender, Arrays.asList(messages));
-    }
-
-    public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
-        if (messages == null || messages.isEmpty() || sender == null) return;
-        if (hasPlaceholderAPI() && sender instanceof Player) {
-            send(sender, PlaceholderAPI.setPlaceholders((Player) sender, messages));
-        } else {
-            send(sender, messages);
-        }
-    }
-
-    public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
-        sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
-    }
-
-    public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
-        sendWithPlaceholders(sender, setCustomParams(messages, params, values));
-    }
-
-    public static List<String> setCustomParams(List<String> messages, String param, Object value) {
-        return setCustomParams(messages, new String[]{param}, new Object[]{value});
-    }
-
-    public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
-        if (params.length != values.length) return messages;
-        HashMap<String, Object> paramsMap = new HashMap<>();
-        for (int i = 0; i < params.length; i++) {
-            paramsMap.put(params[i], values[i]);
-        }
-        return setCustomParams(messages, paramsMap);
-    }
-
-
-    public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
-        List<String> list = new ArrayList<>();
-        for (String message : messages) {
-            String afterMessage = message;
-            for (Map.Entry<String, Object> entry : params.entrySet()) {
-                afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
-            }
-            list.add(afterMessage);
-        }
-        return list;
-    }
-
-
-}

src/main/java/cc/carm/plugin/moeteleport/util/UpdateChecker.java

@@ -1,37 +0,0 @@
-package cc.carm.plugin.moeteleport.util;
-
-import cc.carm.lib.githubreleases4j.GithubReleases4J;
-import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.MoeTeleport;
-
-public class UpdateChecker {
-
-    public static void checkUpdate() {
-        Main.getInstance().getScheduler().runAsync(() -> {
-
-            Integer behindVersions = GithubReleases4J.getVersionBehind(
-                    "CarmJos", "MoeTeleport",
-                    Main.getInstance().getDescription().getVersion()
-            );
-
-            String downloadURL = GithubReleases4J.getReleasesURL("CarmJos", "MoeTeleport");
-
-            MoeTeleport.outputInfo();
-            if (behindVersions == null) {
-                Main.serve("检查更新失败，请您定期查看插件是否更新，避免安全问题。");
-                Main.serve("下载地址 " + downloadURL);
-            } else if (behindVersions == 0) {
-                Main.info("检查完成，当前已是最新版本。");
-            } else if (behindVersions > 0) {
-                Main.info("发现新版本! 目前已落后 " + behindVersions + " 个版本。");
-                Main.info("最新版下载地址 " + downloadURL);
-            } else {
-                Main.serve("检查更新失败! 当前版本未知，请您使用原生版本以避免安全问题。");
-                Main.serve("最新版下载地址 " + downloadURL);
-            }
-
-        });
-    }
-
-
-}

src/main/resources/PLUGIN_INFO

@@ -2,5 +2,6 @@
 &d|     |___ ___&5|_   _|___| |___ ___ ___ ___| |_
 &d| | | | . | -_|&5 | | | -_| | -_| . | . |  _|  _|
 &d|_|_|_|___|___|&5 |_| |___|_|___|  _|___|_| |_|
-&d               &5               |_|
+&8# &dMoe&5Teleport     &5            |_|
-&f 查看更多信息请访问项目主页&d https://github.com/CarmJos/MoeTeleport
+&f 当前版本 &d${project.version} &f查看更多信息请访问项目主页
+&8 -> &d https://github.com/CarmJos/MoeTeleport

src/main/resources/config.yml

@@ -1,69 +0,0 @@
-# ${project.name} - ${project.description}
-# 项目地址: ${project.url}
-# 下载地址: ${project.distributionManagement.downloadUrl}
-version: ${project.version}
-debug: false
-
-# 统计数据设定
-# 该选项用于帮助开发者统计插件版本与使用情况，且绝不会影响性能与使用体验。
-# 当然，您也可以选择在这里关闭，或在plugins/bStats下的配置文件中关闭。
-metrics: true
-
-# 检查更新设定
-# 该选项用于插件判断是否要检查更新，若您不希望插件检查更新并提示您，可以选择关闭。
-# 检查更新为异步操作，绝不会影响性能与使用体验。
-check-update: true
-
-# 存储相关配置
-# 注意：存储配置不会通过重载指令生效，如有修改请重新启动服务器。
-storage:
-
-  # 存储方式，可选 [ yaml | json | mysql | Essential(须安装ess插件) ]
-  method: yaml
-
-  # 选择 yaml/json 存储方式时的存储路径
-  # 默认为相对路径，相对于插件生成的配置文件夹下的路径
-  # 支持绝对路径，如 “/var/data/moe-teleport/"(linux) 或 "D:\data\moe-teleport\"(windows)
-  # 使用绝对路径时请注意权限问题
-  file-path: data
-
-  # 选择 database 存储方式时的数据库配置
-  mysql:
-    # 数据库驱动路径
-    driver: "com.mysql.cj.jdbc.Driver"
-    # 数据库连接配置
-    host: "127.0.0.1"
-    port: 3306
-    database: "minecraft"
-    username: "username"
-    password: "password"
-    # 插件相关表的名称
-    tables:
-      last-location: "mt_last_locations"
-      home: "mt_homes"
-      warps: "mt_warps"
-
-
-defaults:
-  # 默认玩家可设置多少家
-  home: 1
-  # 默认玩家可设置多少地标
-  warp: 0
-
-permissions:
-  home:
-    10: "MoeTeleport.home.vip" # 拥有该权限的玩家最多可以设置10个家
-  warp:
-    2: "MoeTeleport.home.vip" # 拥有该权限的玩家最多可以设置2个地标
-
-# 传送请求过期时间
-expireTime: 30
-
-# 返回死亡点
-# 开启后将允许玩家输入 /back 返回死亡地点。
-death-back: true
-
-# 危险的方块类型，将判断目的地脚下的方块的类型是否在这个列表中
-dangerous-blocks:
-  - LAVA
-  - AIR

src/main/resources/messages.yml

@@ -1,4 +0,0 @@
-# ${project.name} - ${project.description}
-# 项目地址: ${project.url}
-# 下载地址: ${project.distributionManagement.downloadUrl}
-version: ${project.version}

src/main/resources/plugin.yml

@@ -10,6 +10,7 @@ api-version: 1.13
 softdepend:
   - PlaceholderAPI
   - Essentials
+  - CMI
 
 permissions:
   "MoeTeleport":
@@ -25,49 +26,5 @@ commands:
     description: "插件的主命令，用于重载插件或查看插件信息。"
     permission: "MoeTeleport.admin"
     usage: "/MoeTeleport reload"
-
-  "back":
-    description: 返回传送前的上一个地点。
-
-  "tpa":
-    usage: "/tpa <玩家> "
-    description: 请求传送到一个玩家身边。
-  "tpaHere":
-    usage: "/tpaHere <玩家>"
-    description: 请求一个玩家传送到自己身边。
-  "tpAccept":
-    usage: "/tpAccept [玩家]"
-    description: 同意一个请求，可以限定某个玩家。
-  "tpDeny":
-    usage: "/tpDeny [玩家]"
-    description: 拒绝一个请求，可以限定某个玩家。
-
-  "home":
-    usage: "/home [名称] "
-    description: "返回家所在位置。"
-  "listHome":
-    description: "列出所有家的位置。"
-  "setHome":
-    usage: "/setHome [名称] "
-    description: "设置家的传送点 (不填名称默认为home)"
-  "delHome":
-    usage: "/delHome <名称> "
-    description: "删除家的传送点。"
-
-  "warp":
-    usage: "/warp [名称] "
-    description: "返回地标点所在位置。"
-  "warpInfo":
-    usage: "/warpInfo <名称> "
-    description: "查看地标点相关信息。"
-  "listWarps":
     aliases:
-      - warps
+      - mt
-    usage: “/listWarps [页码]”
-    description: "列出服务器中所有地标点位置。"
-  "setWarp":
-    usage: "/setWarp [名称] "
-    description: "设置地标传送点 (不填名称默认为自己的游戏ID)"
-  "delWarp":
-    usage: "/delWarp <名称> "
-    description: "删除一个地标传送点。"