Merge remote-tracking branch 'origin/master'

- [A] 添加 #7 所提到的地标点相关功能，支持玩家自设地标点并作出限制。
- [U] 修改项目结构，开始采用EasyPlugin结构。
- [U] 更换消息配置文件读取格式与读取方式。
- [A] 为 setHome 覆盖旧位置添加一条独立的消息，避免手误使旧地址丢失。
- [A] 离线也将会保存玩家最后地址，避免出现死亡后掉线失去最后地址的问题。

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+
+custom: ['https://donate.carm.cc']

.github/ISSUE_TEMPLATE/bugs_report.md

@@ -8,23 +8,25 @@ assignees: ''
 ---
 
 **问题简述**
-用简短的话语描述一下大概问题。
+<!--用简短的话语描述一下大概问题。-->
 
 **问题来源**
+<!--
 描述一下通过哪些操作才发现的问题，如：
 1. 打开 '...'
 2. 点击了 '....'
 3. 出现了报错 '....'
+-->
 
 **预期结果**(可选)
-如果问题不发生，应该是什么情况
+<!--如果问题不发生，应该是什么情况-->
 
 **问题截图/问题报错**
-如果有报错或输出，请提供截图。
+<!--如果有报错或输出，请提供截图。-->
 
 **操作环境**
-请在后台输入 `version` 并复制相关输出。
+<!--请在后台输入 `version` 并复制相关输出。-->
 
 
 **其他补充**
-如有其他补充，可以在这里描述。
+<!--如有其他补充，可以在这里描述。-->

.github/ISSUE_TEMPLATE/feature_issues.md

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

.gitignore

@@ -2,3 +2,4 @@
 /target/
 ./*.iml
 *.iml
+asset/

README.md

@@ -11,10 +11,35 @@
 
 # MoeTeleport 喵喵传送
 
-简单的传送请求插件，支持设置家与返回上一个地点。
+开源的传送插件，包含数个功能，并根据用户需求持续更新添加新功能。
+
+项目代码符合开发规范，适合新手开发者学习Bukkit，制作属于自己的插件。
 
 本插件由 [璎珞服务器](https://www.yingluo.world/) 请求本人开发，经过授权后开源。
 
+## 功能与优势
+
+### 当前功能
+
+- 多种存储格式，按需选择。
+  - 支持 YAML、JSON 与 MySQL/MariaDB 存储方式
+  - 支持直接调用 [EssentialsX](https://github.com/EssentialsX/Essentials) 数据，无缝切换
+- 可点击的消息(如“点击同意”) 
+  - 基于MineDown语法，可自定义配置
+- 玩家间的传送请求
+  - 支持指定处理某位玩家的请求
+- 设置家与回家 (可以理解为私人地标)
+  - 支持依照权限设定不同数量的家作为VIP附加内容
+- 回到死亡地点、上一传送地点
+
+### 优势
+- **轻量插件。** 适合小型服务器使用，配置简单方便。
+- **规范开发。** 插件架构符合开发规范，适合新手开发者学习。
+  - 自 [v3.0.0]() 版本开始采用了 EasyPlugin 开发，可能与其他主流插件结构有些不同。
+- **持续维护。** 新功能需求均可提交，大概率在后续开发中支持。
+  - 功能需求请 [提交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/) 实现。

pom.xml

@@ -9,11 +9,13 @@
         <maven.compiler.target>8</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>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>moeteleport</artifactId>
-    <version>2.0.0</version>
+    <version>3.1.0</version>
 
     <name>MoeTeleport</name>
     <description>喵喵传送，简单的传送、设置家的插件。</description>
@@ -76,6 +78,11 @@
             <url>https://repo.minebench.de/</url>
         </repository>
 
+        <repository>
+            <id>essentials-repo</id>
+            <url>https://repo.essentialsx.net/releases/</url>
+        </repository>
+
         <repository>
             <id>github</id>
             <name>GitHub Packages</name>
@@ -108,11 +115,58 @@
             <scope>provided</scope>
         </dependency>
 
+
+        <dependency>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.19.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easysql-beecp</artifactId>
+            <version>${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>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -132,8 +186,45 @@
     </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>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${project.basedir}/asset/</directory>
+                            <useDefaultExcludes>true</useDefaultExcludes>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                        </fileset>
+                        <fileset>
+                            <directory>${project.basedir}/api-docs/</directory>
+                            <useDefaultExcludes>true</useDefaultExcludes>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -193,6 +284,26 @@
                             <pattern>de.themoep.minedown</pattern>
                             <shadedPattern>cc.carm.plugin.moeteleport.lib.minedown</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>cc.carm.plugin.moeteleport.lib.bstats</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,39 +1,49 @@
 package cc.carm.plugin.moeteleport;
 
+import cc.carm.lib.easyplugin.EasyPlugin;
+import cc.carm.lib.easyplugin.i18n.EasyPluginMessageProvider;
 import cc.carm.plugin.moeteleport.command.BackCommand;
 import cc.carm.plugin.moeteleport.command.MoeTeleportCommand;
 import cc.carm.plugin.moeteleport.command.completer.HomeNameCompleter;
 import cc.carm.plugin.moeteleport.command.completer.PlayerNameCompleter;
 import cc.carm.plugin.moeteleport.command.completer.TpRequestCompleter;
-import cc.carm.plugin.moeteleport.command.home.DelHomeCommand;
+import cc.carm.plugin.moeteleport.command.completer.WarpNameCompleter;
-import cc.carm.plugin.moeteleport.command.home.GoHomeCommand;
+import cc.carm.plugin.moeteleport.command.home.HomeDelCommand;
-import cc.carm.plugin.moeteleport.command.home.ListHomeCommand;
+import cc.carm.plugin.moeteleport.command.home.HomeListCommand;
-import cc.carm.plugin.moeteleport.command.home.SetHomeCommand;
+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.RequestManager;
 import cc.carm.plugin.moeteleport.manager.UserManager;
-import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.manager.WarpManager;
-import cc.carm.plugin.moeteleport.util.ColorParser;
+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.command.CommandExecutor;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-public class Main extends JavaPlugin {
+import java.util.Arrays;
 
-    public static boolean debugMode = true;
+public class Main extends EasyPlugin {
     private static Main instance;
+    private static DataStorage storage;
+    private WarpManager warpManager;
     private UserManager userManager;
     private RequestManager requestManager;
 
+    public Main() {
+        super(new EasyPluginMessageProvider.zh_CN());
+        instance = this;
+    }
+
     /**
      * 注册监听器
      *
@@ -43,107 +53,142 @@ public class Main extends JavaPlugin {
         Bukkit.getPluginManager().registerEvents(listener, getInstance());
     }
 
-    public static void log(String message) {
+    public static void info(String... messages) {
-        Bukkit.getConsoleSender().sendMessage(ColorParser.parse("[" + getInstance().getName() + "] " + message));
+        getInstance().log(messages);
     }
 
-    public static void error(String message) {
+    public static void serve(String... messages) {
-        log("&4[ERROR] &r" + message);
+        getInstance().error(messages);
     }
 
-    public static void debug(String message) {
+    public static void debugging(String... messages) {
-        if (debugMode) {
+        getInstance().debug(messages);
-            log("&b[DEBUG] &r" + message);
-        }
     }
 
     public static Main getInstance() {
         return instance;
     }
 
-    public static void registerCommand(String commandName,
-                                       @NotNull CommandExecutor executor) {
-        registerCommand(commandName, executor, null);
-    }
-
-    public static void registerCommand(String commandName,
-                                       @NotNull CommandExecutor executor,
-                                       @Nullable TabCompleter tabCompleter) {
-        PluginCommand command = Bukkit.getPluginCommand(commandName);
-        if (command == null) return;
-        command.setExecutor(executor);
-        if (tabCompleter != null) command.setTabCompleter(tabCompleter);
-    }
-
-    public static UserManager getUserManager() {
-        return Main.getInstance().userManager;
-    }
-
-    public static RequestManager getRequestManager() {
-        return Main.getInstance().requestManager;
-    }
-
     @Override
-    public void onEnable() {
+    protected boolean initialize() {
-        instance = this;
-        log(getName() + " " + getDescription().getVersion() + " &7开始加载...");
-        long startTime = System.currentTimeMillis();
 
-        log("加载配置文件...");
+        info("加载配置文件...");
-        ConfigManager.initConfig();
+        if (!ConfigManager.initConfig()) {
-
+            serve("配置文件初始化失败，请检查。");
-        log("加载用户管理器...");
+            setEnabled(false);
-        this.userManager = new UserManager(this);
+            return false;
-
-        if (Bukkit.getOnlinePlayers().size() > 0) {
-            log("   加载现有用户数据...");
-            for (Player player : Bukkit.getOnlinePlayers()) {
-                UserData data = Main.getUserManager().loadData(player.getUniqueId());
-                Main.getUserManager().getUserDataMap().put(player.getUniqueId(), data);
-            }
         }
 
-        log("加载请求管理器...");
+        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);
 
-        log("注册监听器...");
+        info("注册监听器...");
         regListener(new UserListener());
 
-        log("注册指令...");
+        info("注册指令...");
         registerCommand("MoeTeleport", new MoeTeleportCommand());
 
         registerCommand("back", new BackCommand());
 
-        registerCommand("home", new GoHomeCommand(), new HomeNameCompleter());
+        registerCommand("listHome", new HomeListCommand());
-        registerCommand("delHome", new DelHomeCommand(), new HomeNameCompleter());
+        registerCommand("home", new HomeTpCommand(), new HomeNameCompleter());
-        registerCommand("setHome", new SetHomeCommand());
+        registerCommand("setHome", new HomeSetCommand());
-        registerCommand("listHome", new ListHomeCommand());
+        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());
 
-        log("加载完成 ，共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
+        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 void onDisable() {
+    protected void shutdown() {
-        log(getName() + " " + getDescription().getVersion() + " 开始卸载...");
+        info("关闭所有请求...");
-        long startTime = System.currentTimeMillis();
-
-        log("关闭所有请求...");
         getRequestManager().shutdown();
 
-        log("保存用户数据...");
+        info("保存用户数据...");
-        getUserManager().getUserDataMap().values().forEach(UserData::save);
+        getUserManager().unloadAll(true);
-        getUserManager().getUserDataMap().clear();
 
-        log("卸载监听器...");
+        info("保存地标数据...");
+        getWarpManager().saveWarps();
+
+        info("终止存储源...");
+        getStorage().shutdown();
+
+        info("卸载监听器...");
         Bukkit.getServicesManager().unregisterAll(this);
-
-        log("卸载完成 ，共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
     }
 
+    @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

@@ -0,0 +1,41 @@
+package cc.carm.plugin.moeteleport;
+
+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 java.util.function.Supplier;
+
+public class MoeTeleport {
+
+    public static void outputInfo() {
+        Main.getInstance().outputInfo();
+    }
+
+    public static DataStorage getStorage() {
+        return Main.getInstance().getStorage();
+    }
+
+    public static WarpManager getWarpManager() {
+        return Main.getInstance().getWarpManager();
+    }
+
+    public static UserManager getUserManager() {
+        return Main.getInstance().getUserManager();
+    }
+
+    public static RequestManager getRequestManager() {
+        return Main.getInstance().getRequestManager();
+    }
+
+    public void registerCustomStorage(DataStorage storage) {
+        registerCustomStorage(() -> storage);
+    }
+
+    public void registerCustomStorage(Supplier<DataStorage> storageSupplier) {
+        StorageMethod.CUSTOM.setStorageSupplier(storageSupplier);
+    }
+
+}

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

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command;
 
-import cc.carm.plugin.moeteleport.Main;
+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;
@@ -16,9 +16,9 @@ public class BackCommand implements CommandExecutor {
     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 = Main.getUserManager().getData(player);
+        UserData data = MoeTeleport.getUserManager().getData(player);
         if (data.getLastLocation() == null) {
-            PluginMessages.NO_LAST_LOCATION.send(player);
+            PluginMessages.Back.NO_LAST_LOCATION.send(player);
             return true;
         }
         TeleportManager.teleport(player, data.getLastLocation(), false);

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

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.completer;
 
-import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.MoeTeleport;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -19,7 +19,8 @@ public class HomeNameCompleter implements TabCompleter {
     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 Main.getUserManager().getData((Player) sender).getHomeLocations().keySet().stream()
+            return MoeTeleport.getUserManager().getData((Player) sender)
+                    .getHomeLocations().keySet().stream()
                     .filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
                     .limit(10).collect(Collectors.toList());
         } else {

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

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.completer;
 
-import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.MoeTeleport;
 import cc.carm.plugin.moeteleport.model.UserData;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.Bukkit;
@@ -39,7 +39,7 @@ public class TpRequestCompleter implements TabCompleter {
     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 = Main.getUserManager().getData((Player) sender);
+            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]))

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

@@ -0,0 +1,48 @@
+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/HomeDelCommand.java

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.home;
 
-import cc.carm.plugin.moeteleport.Main;
+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;
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 
-public class DelHomeCommand implements CommandExecutor {
+public class HomeDelCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@@ -21,15 +21,13 @@ public class DelHomeCommand implements CommandExecutor {
         if (args.length < 1) return false;
 
         Player player = (Player) sender;
-        UserData data = Main.getUserManager().getData(player);
+        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.sendWithPlaceholders(player);
+            PluginMessages.Home.NOT_FOUND.send(player);
         } else {
-            PluginMessages.Home.REMOVED.sendWithPlaceholders(player,
+            PluginMessages.Home.REMOVED.send(player, locationInfo.getKey(), locationInfo.getValue().toFlatString());
-                    new String[]{"%(name)", "%(location)"},
-                    new Object[]{locationInfo.getKey(), locationInfo.getValue().toFlatString()});
             data.delHomeLocation(homeName);
         }
         return true;

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

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.home;
 
-import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.MoeTeleport;
 import cc.carm.plugin.moeteleport.configuration.PluginMessages;
 import cc.carm.plugin.moeteleport.model.UserData;
 import org.bukkit.command.Command;
@@ -9,20 +9,16 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public class ListHomeCommand implements CommandExecutor {
+public class HomeListCommand 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 = Main.getUserManager().getData(player);
+        UserData data = MoeTeleport.getUserManager().getData(player);
-        PluginMessages.Home.HEADER.sendWithPlaceholders(player);
+        PluginMessages.Home.List.HEADER.send(player);
-        data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.LIST_OBJECT
+        data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.List.OBJECT.send(player, name, loc.toFlatString()));
-                .sendWithPlaceholders(player,
-                        new String[]{"%(id)", "%(location)"},
-                        new Object[]{name, loc.toFlatString()}
-                ));
         return true;
     }
 

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

@@ -0,0 +1,49 @@
+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/HomeTpCommand.java

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.home;
 
-import cc.carm.plugin.moeteleport.Main;
+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;
@@ -13,18 +13,18 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 
-public class GoHomeCommand implements CommandExecutor {
+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 = Main.getUserManager().getData(player);
+        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.sendWithPlaceholders(player);
+            PluginMessages.Home.NOT_FOUND.send(player);
         } else {
             TeleportManager.teleport(player, locationInfo.getValue(), false);
         }

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

@@ -1,38 +0,0 @@
-package cc.carm.plugin.moeteleport.command.home;
-
-import cc.carm.plugin.moeteleport.Main;
-import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-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 SetHomeCommand 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 = Main.getUserManager().getData(player);
-        String homeName = args.length >= 1 ? args[0] : "home";
-
-        int maxHome = Main.getUserManager().getMaxHome(player);
-        if (data.getHomeLocations().size() >= maxHome && data.getHomeLocation(homeName) == null) {
-            PluginMessages.Home.OVER_LIMIT.sendWithPlaceholders(sender,
-                    new String[]{"%(max)"}, new Object[]{maxHome}
-            );
-            return true;
-        }
-
-        data.setHomeLocation(homeName, player.getLocation());
-        PluginMessages.Home.SET.sendWithPlaceholders(player,
-                new String[]{"%(name)"}, new Object[]{homeName}
-        );
-        return true;
-    }
-
-
-}

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

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.tpa;
 
-import cc.carm.plugin.moeteleport.Main;
+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;
@@ -20,9 +20,9 @@ public class TpHandleCommand implements CommandExecutor {
                              @NotNull String label, @NotNull String[] args) {
         if (!(sender instanceof Player)) return false;
         Player player = (Player) sender;
-        UserData data = Main.getUserManager().getData(player);
+        UserData data = MoeTeleport.getUserManager().getData(player);
         if (data.getReceivedRequests().isEmpty()) {
-            PluginMessages.Request.NOT_FOUND.sendWithPlaceholders(player);
+            PluginMessages.Requests.EMPTY_REQUESTS.send(player);
             return true;
         }
         String targetName = args.length > 0 ? args[0] : null;
@@ -31,10 +31,7 @@ public class TpHandleCommand implements CommandExecutor {
         if (targetName != null) {
             Player target = Bukkit.getPlayer(targetName);
             if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
-                PluginMessages.Request.NOT_FOUND_PLAYER.sendWithPlaceholders(player,
+                PluginMessages.Requests.NO_REQUEST_FROM.send(player, target == null ? targetName : target.getName());
-                        new String[]{"%(player)"},
-                        new Object[]{target == null ? targetName : target.getName()}
-                );
             } else {
                 handle(data.getReceivedRequests().get(target.getUniqueId()), accept); // 交给Manager处理
             }
@@ -44,10 +41,7 @@ public class TpHandleCommand implements CommandExecutor {
                         .min(Comparator.comparingLong(TeleportRequest::getActiveTime))
                         .ifPresent(request -> handle(request, accept));
             } else {
-                PluginMessages.Request.MULTI.sendWithPlaceholders(player,
+                PluginMessages.Requests.MULTI.send(player, data.getReceivedRequests().size(), command.getName());
-                        new String[]{"%(num)", "%(command)"},
-                        new Object[]{data.getReceivedRequests().size(), command.getName()}
-                );
                 data.setEnableAutoSelect(true);
             }
         }
@@ -56,9 +50,9 @@ public class TpHandleCommand implements CommandExecutor {
 
     private void handle(TeleportRequest request, boolean accept) {
         if (accept) {
-            Main.getRequestManager().acceptRequest(request);
+            MoeTeleport.getRequestManager().acceptRequest(request);
         } else {
-            Main.getRequestManager().denyRequest(request);
+            MoeTeleport.getRequestManager().denyRequest(request);
         }
     }
 

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

@@ -1,6 +1,6 @@
 package cc.carm.plugin.moeteleport.command.tpa;
 
-import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.MoeTeleport;
 import cc.carm.plugin.moeteleport.configuration.PluginMessages;
 import cc.carm.plugin.moeteleport.model.TeleportRequest;
 import org.bukkit.Bukkit;
@@ -19,22 +19,25 @@ public class TpaCommand implements CommandExecutor {
         Player player = (Player) sender;
         Player target = Bukkit.getPlayer(args[0]);
         if (target == null) {
-            PluginMessages.NOT_ONLINE.sendWithPlaceholders(player);
+            PluginMessages.NOT_ONLINE.send(player);
             return true;
         }
 
-        TeleportRequest request = Main.getUserManager().getData(target).getReceivedRequests().get(player.getUniqueId());
+        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.Request.DUPLICATE.sendWithPlaceholders(sender,
+            PluginMessages.Requests.DUPLICATE.send(sender, target.getName(), request.getRemainSeconds());
-                    new String[]{"%(player)", "%(expire)"},
-                    new Object[]{target.getName(), request.getRemainSeconds()}
-            );
             return true;
         }
         if (command.getName().equalsIgnoreCase("tpa")) {
-            Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
+            MoeTeleport.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
         } else {
-            Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
+            MoeTeleport.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
         }
 
         return true;

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

@@ -0,0 +1,40 @@
+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/WarpInfoCommand.java

@@ -0,0 +1,35 @@
+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 WarpInfoCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
+                             @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);
+        if (info == null) {
+            PluginMessages.Warp.NOT_FOUND.send(player);
+            return true;
+        }
+
+        String ownerName = info.getOwnerName();
+        if (ownerName != null) {
+            PluginMessages.Warp.INFO_FULL.send(player, warpName, ownerName, info.getLocation().toFlatString());
+        } else {
+            PluginMessages.Warp.INFO_LOCATION.send(player, warpName, info.getLocation().toFlatString());
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,58 @@
+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;
+
+import java.util.ArrayList;
+
+public class WarpListCommand 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;
+
+        ArrayList<WarpInfo> warps = new ArrayList<>(MoeTeleport.getWarpManager().listWarps().values());
+        if (warps.isEmpty()) {
+            PluginMessages.Warp.EMPTY.send(player);
+            return true;
+        }
+
+        String pageString = args.length > 0 ? args[0] : null;
+        int page = 1;
+        if (pageString != null) {
+            try {
+                page = Integer.parseInt(pageString);
+            } catch (Exception ignored) {
+            }
+        }
+
+        int maxPage = (int) Math.ceil(warps.size() / 10.0);
+        int currentPage = Math.min(page, maxPage);
+
+        int startIndex = Math.max(0, (currentPage - 1) * 10);
+        int endIndex = Math.min(warps.size(), startIndex + 9);
+
+        PluginMessages.Warp.List.HEADER.send(player, 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());
+            } else {
+                PluginMessages.Warp.List.OBJECT.send(player, info.getName(), ownerName, info.getLocation().toFlatString());
+            }
+        }
+
+        return true;
+    }
+
+
+}

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

@@ -0,0 +1,51 @@
+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/WarpTpCommand.java

@@ -0,0 +1,32 @@
+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/configuration/PluginConfig.java

@@ -1,13 +1,33 @@
 package cc.carm.plugin.moeteleport.configuration;
 
-import cc.carm.plugin.moeteleport.configuration.values.ConfigValue;
+import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
-import cc.carm.plugin.moeteleport.configuration.values.ConfigValueList;
+import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
-import cc.carm.plugin.moeteleport.configuration.values.ConfigValueMap;
+import cc.carm.lib.easyplugin.configuration.values.ConfigValueMap;
 
 public class PluginConfig {
 
-    public static final ConfigValueMap<Integer, String> PERMISSIONS = new ConfigValueMap<>(
+    public static final ConfigValue<Boolean> DEBUG = new ConfigValue<>(
-            "permissions", Integer::parseInt, String.class
+            "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<>(
@@ -19,7 +39,11 @@ public class PluginConfig {
     );
 
     public static final ConfigValue<Integer> DEFAULT_HOME = new ConfigValue<>(
-            "defaultHome", Integer.class, 1
+            "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<>(

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

@@ -1,55 +1,222 @@
 package cc.carm.plugin.moeteleport.configuration;
 
-import cc.carm.plugin.moeteleport.configuration.message.ConfigMessage;
+import cc.carm.lib.easyplugin.configuration.language.EasyMessageList;
-import cc.carm.plugin.moeteleport.configuration.message.ConfigMessageList;
+import cc.carm.lib.easyplugin.configuration.language.MessagesRoot;
+import cc.carm.plugin.moeteleport.configuration.messages.MoeMessageList;
 
-public class PluginMessages {
+public class PluginMessages extends MessagesRoot {
 
-    public static final ConfigMessageList NO_LAST_LOCATION = new ConfigMessageList("no-last-location");
+    public static final EasyMessageList NOT_ONLINE = MoeMessageList.builder().contents(
+            "&f目标玩家并不在线，无法发送请求。"
+    ).build();
 
-    public static final ConfigMessageList NOT_ONLINE = new ConfigMessageList("not-online");
+    public static class Back {
 
-    public static final ConfigMessageList TPA = new ConfigMessageList("tpa");
+        public static final EasyMessageList NO_LAST_LOCATION = MoeMessageList.builder().contents(
-    public static final ConfigMessageList TPA_HERE = new ConfigMessageList("tpahere");
+                "&f您当前没有进行任何传送，无法返回上个地点。"
+        ).build();
 
-    public static final ConfigMessageList TP_ACCEPT = new ConfigMessageList("tpaccept");
+        public static final EasyMessageList DEATH_MESSAGE = MoeMessageList.builder().contents(
-    public static final ConfigMessageList TP_DENY = new ConfigMessageList("tpdeny");
+                "&f您可以输入 &5/back &f或 [&d&l点击这里](show_text=点击返回到死亡地点 run_command=/back) &f返回您的死亡地点。"
+        ).build();
 
-    public static final ConfigMessageList ACCEPTED = new ConfigMessageList("accepted");
-    public static final ConfigMessageList DENIED = new ConfigMessageList("denied");
-
-    public static final ConfigMessageList TELEPORTING = new ConfigMessageList("teleporting");
-    public static final ConfigMessageList DANGEROUS = new ConfigMessageList("dangerous");
-    public static final ConfigMessageList DANGEROUS_HERE = new ConfigMessageList("dangerous-here");
-
-    public static final ConfigMessageList NOT_AVAILABLE = new ConfigMessageList("notAvailable");
-
-    public static final ConfigMessageList DEATH_BACK = new ConfigMessageList("death-back");
-
-    public static class Request {
-        public static final ConfigMessageList DUPLICATE = new ConfigMessageList("request-duplicate");
-        public static final ConfigMessageList OFFLINE = new ConfigMessageList("offline");
-
-        public static final ConfigMessageList SENT = new ConfigMessageList("request-sent");
-        public static final ConfigMessageList MULTI = new ConfigMessageList("multi-requests");
-        public static final ConfigMessageList SENT_TIMEOUT = new ConfigMessageList("request-sent-timeout");
-        public static final ConfigMessageList RECEIVED_TIMEOUT = new ConfigMessageList("request-received-timeout");
-
-        public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("no-request");
-        public static final ConfigMessageList NOT_FOUND_PLAYER = new ConfigMessageList("no-request-player");
     }
 
+    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 ConfigMessageList HEADER = new ConfigMessageList("home-list-header");
-        public static final ConfigMessage LIST_OBJECT = new ConfigMessage("home-list-object");
 
-        public static final ConfigMessageList OVER_LIMIT = new ConfigMessageList("home-over-limit");
+        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 final ConfigMessageList NOT_FOUND = new ConfigMessageList("home-not-found");
+        public static class List {
-        public static final ConfigMessageList SET = new ConfigMessageList("home-set");
+
+            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();
+
+        }
 
-        public static final ConfigMessageList REMOVED = new ConfigMessageList("home-removed");
 
     }
 

src/main/java/cc/carm/plugin/moeteleport/configuration/file/FileConfig.java

@@ -1,64 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.file;
-
-
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.File;
-import java.io.IOException;
-
-public class FileConfig {
-
-    private final JavaPlugin plugin;
-    private final String fileName;
-
-
-    private File file;
-    private FileConfiguration config;
-
-    public FileConfig(final JavaPlugin plugin) {
-        this(plugin, "config.yml");
-    }
-
-    public FileConfig(final JavaPlugin plugin, final String name) {
-        this.plugin = plugin;
-        this.fileName = name;
-        initFile();
-    }
-
-    private void initFile() {
-        this.file = new File(plugin.getDataFolder(), fileName);
-        if (!this.file.exists()) {
-            if (!this.file.getParentFile().exists()) {
-                boolean success = this.file.getParentFile().mkdirs();
-            }
-            plugin.saveResource(fileName, true);
-        }
-        this.config = YamlConfiguration.loadConfiguration(this.file);
-    }
-
-    public File getFile() {
-        return file;
-    }
-
-    public FileConfiguration getConfig() {
-        return config;
-    }
-
-    public void save() {
-        try {
-            getConfig().save(getFile());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void reload() {
-        if (getFile().exists()) {
-            this.config = YamlConfiguration.loadConfiguration(getFile());
-        } else {
-            initFile();
-        }
-    }
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/message/ConfigMessage.java

@@ -1,32 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.message;
-
-import cc.carm.plugin.moeteleport.configuration.values.ConfigValue;
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
-import cc.carm.plugin.moeteleport.util.MessageUtil;
-import org.bukkit.command.CommandSender;
-
-import java.util.Collections;
-
-public class ConfigMessage extends ConfigValue<String> {
-
-    public ConfigMessage(String configSection) {
-        this(configSection, null);
-    }
-
-    public ConfigMessage(String configSection, String defaultValue) {
-        super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
-    }
-
-    public void send(CommandSender sender) {
-        MessageUtil.send(sender, get());
-    }
-
-    public void sendWithPlaceholders(CommandSender sender) {
-        MessageUtil.sendWithPlaceholders(sender, get());
-    }
-
-    public void sendWithPlaceholders(CommandSender sender, String[] params, Object[] values) {
-        MessageUtil.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/message/ConfigMessageList.java

@@ -1,30 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.message;
-
-import cc.carm.plugin.moeteleport.configuration.values.ConfigValueList;
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
-import cc.carm.plugin.moeteleport.util.MessageUtil;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.Nullable;
-
-public class ConfigMessageList extends ConfigValueList<String> {
-
-    public ConfigMessageList(String configSection) {
-        super(ConfigManager.getMessageConfig(), configSection, String.class);
-    }
-
-    public ConfigMessageList(String configSection, String[] defaultValue) {
-        super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
-    }
-
-    public void send(@Nullable CommandSender sender) {
-        MessageUtil.send(sender, get());
-    }
-
-    public void sendWithPlaceholders(@Nullable CommandSender sender) {
-        MessageUtil.sendWithPlaceholders(sender, get());
-    }
-
-    public void sendWithPlaceholders(@Nullable CommandSender sender, String[] params, Object[] values) {
-        MessageUtil.sendWithPlaceholders(sender, get(), params, values);
-    }
-}

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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,37 @@
+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/configuration/values/ConfigValue.java

@@ -1,58 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.values;
-
-import cc.carm.plugin.moeteleport.configuration.file.FileConfig;
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
-import org.bukkit.configuration.file.FileConfiguration;
-
-public class ConfigValue<V> {
-
-    FileConfig source;
-
-    String configSection;
-    Class<V> clazz;
-    V defaultValue;
-
-    public ConfigValue(String configSection, Class<V> clazz) {
-        this(configSection, clazz, null);
-    }
-
-    public ConfigValue(String configSection, Class<V> clazz, V defaultValue) {
-        this(ConfigManager.getPluginConfig(), configSection, clazz, defaultValue);
-    }
-
-    public ConfigValue(FileConfig source, String configSection, Class<V> clazz, V defaultValue) {
-        this.source = source;
-        this.configSection = configSection;
-        this.clazz = clazz;
-        this.defaultValue = defaultValue;
-    }
-
-    public FileConfiguration getConfiguration() {
-        return this.source.getConfig();
-    }
-
-    public V get() {
-        if (getConfiguration().contains(this.configSection)) {
-            Object val = getConfiguration().get(this.configSection, this.defaultValue);
-            return this.clazz.isInstance(val) ? this.clazz.cast(val) : this.defaultValue;
-        } else {
-            // 如果没有默认值，就把配置写进去，便于配置
-            return setDefault();
-        }
-    }
-
-    public void set(V value) {
-        getConfiguration().set(this.configSection, value);
-        this.save();
-    }
-
-    public void save() {
-        this.source.save();
-    }
-
-    public V setDefault() {
-        set(this.defaultValue);
-        return this.defaultValue;
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/values/ConfigValueList.java

@@ -1,71 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.values;
-
-import cc.carm.plugin.moeteleport.configuration.file.FileConfig;
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
-import org.bukkit.configuration.file.FileConfiguration;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class ConfigValueList<V> {
-    FileConfig source;
-    String configSection;
-    Class<V> clazz;
-
-    V[] defaultValue;
-
-    public ConfigValueList(String configSection, Class<V> clazz) {
-        this(ConfigManager.getPluginConfig(), configSection, clazz);
-    }
-
-    public ConfigValueList(String configSection, Class<V> clazz, V[] defaultValue) {
-        this(ConfigManager.getPluginConfig(), configSection, clazz, defaultValue);
-    }
-
-    public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz) {
-        this(configuration, configSection, clazz, null);
-    }
-
-    public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz, V[] defaultValue) {
-        this.source = configuration;
-        this.configSection = configSection;
-        this.clazz = clazz;
-        this.defaultValue = defaultValue;
-    }
-
-    public FileConfiguration getConfiguration() {
-        return this.source.getConfig();
-    }
-
-
-    public ArrayList<V> get() {
-        List<?> list = getConfiguration().getList(this.configSection);
-        if (list == null) {
-            if (defaultValue != null) {
-                return new ArrayList<>(Arrays.asList(defaultValue));
-            } else {
-                return new ArrayList<>();
-            }
-        } else {
-            ArrayList<V> result = new ArrayList<>();
-
-            for (Object object : list) {
-                if (this.clazz.isInstance(object)) {
-                    result.add(this.clazz.cast(object));
-                }
-            }
-            return result;
-        }
-    }
-
-    public void set(ArrayList<V> value) {
-        getConfiguration().set(this.configSection, value);
-        this.save();
-    }
-
-    public void save() {
-        this.source.save();
-    }
-
-}

src/main/java/cc/carm/plugin/moeteleport/configuration/values/ConfigValueMap.java

@@ -1,79 +0,0 @@
-package cc.carm.plugin.moeteleport.configuration.values;
-
-import cc.carm.plugin.moeteleport.configuration.file.FileConfig;
-import cc.carm.plugin.moeteleport.manager.ConfigManager;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-
-public class ConfigValueMap<K, V> {
-
-    @NotNull FileConfig source;
-    @NotNull String configSection;
-
-    @NotNull Function<String, K> keyCast;
-    @NotNull Class<V> valueClazz;
-
-    @Nullable LinkedHashMap<K, V> valueCache;
-
-    public ConfigValueMap(@NotNull String configSection, @NotNull Function<String, K> keyCast,
-                          @NotNull Class<V> valueClazz) {
-        this(ConfigManager.getPluginConfig(), configSection, keyCast, valueClazz);
-    }
-
-    public ConfigValueMap(@NotNull FileConfig configuration, @NotNull String configSection,
-                          @NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
-        this.source = configuration;
-        this.configSection = configSection;
-        this.keyCast = keyCast;
-        this.valueClazz = valueClazz;
-    }
-
-
-    public @NotNull FileConfiguration getConfiguration() {
-        return this.source.getConfig();
-    }
-
-    public void clearCache() {
-        this.valueCache = null;
-    }
-
-    @NotNull
-    public Map<K, V> get() {
-        if (valueCache != null) return valueCache;
-        ConfigurationSection section = getConfiguration().getConfigurationSection(this.configSection);
-        if (section == null) return new LinkedHashMap<>();
-        Set<String> keys = section.getKeys(false);
-        if (keys.isEmpty()) return new LinkedHashMap<>();
-        else {
-            LinkedHashMap<K, V> result = new LinkedHashMap<>();
-            for (String key : keys) {
-                K finalKey = keyCast.apply(key);
-                Object val = section.get(key);
-                V finalValue = this.valueClazz.isInstance(val) ? this.valueClazz.cast(val) : null;
-                if (finalKey != null && finalValue != null) {
-                    result.put(finalKey, finalValue);
-                }
-            }
-            this.valueCache = result;
-            return result;
-        }
-    }
-
-    public void set(LinkedHashMap<K, V> valuesMap) {
-        this.valueCache = valuesMap;
-        getConfiguration().createSection(this.configSection, valuesMap);
-        this.save();
-    }
-
-    public void save() {
-        this.source.save();
-    }
-
-}

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

@@ -1,9 +1,8 @@
 package cc.carm.plugin.moeteleport.listener;
 
-import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.MoeTeleport;
 import cc.carm.plugin.moeteleport.configuration.PluginConfig;
 import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.model.UserData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -11,31 +10,26 @@ import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.util.UUID;
-
 public class UserListener implements Listener {
 
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        UUID uuid = event.getPlayer().getUniqueId();
+        MoeTeleport.getUserManager().loadData(event.getPlayer().getUniqueId());
-        UserData data = Main.getUserManager().loadData(uuid);
-        Main.getUserManager().getUserDataMap().put(uuid, data);
     }
 
     @EventHandler
     public void onQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
-        Main.getRequestManager().cancelAllRequests(player);
+        MoeTeleport.getRequestManager().cancelAllRequests(player);
-        Main.getUserManager().getData(player).save(); //保存
+        MoeTeleport.getUserManager().unloadData(player.getUniqueId());
-        Main.getUserManager().getUserDataMap().remove(player.getUniqueId());
     }
 
     @EventHandler
     public void onDeath(PlayerDeathEvent event) {
         if (PluginConfig.DEATH_GO_BACK.get()) {
             Player player = event.getEntity();
-            Main.getUserManager().getData(player).setLastLocation(player.getLocation());
+            MoeTeleport.getUserManager().getData(player).setLastLocation(player.getLocation());
-            PluginMessages.DEATH_BACK.send(player);
+            PluginMessages.Back.DEATH_MESSAGE.send(player);
         }
     }
 

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

@@ -1,17 +1,32 @@
 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.PluginConfig;
+import cc.carm.plugin.moeteleport.configuration.PluginMessages;
-import cc.carm.plugin.moeteleport.configuration.file.FileConfig;
+
+import java.io.IOException;
 
 public class ConfigManager {
 
     private static FileConfig config;
-    private static FileConfig messageConfig;
+    private static MessagesConfig messageConfig;
 
-    public static void initConfig() {
+    public static boolean initConfig() {
-        ConfigManager.config = new FileConfig(Main.getInstance(), "config.yml");
+        try {
-        ConfigManager.messageConfig = new FileConfig(Main.getInstance(), "messages.yml");
+            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() {
@@ -23,14 +38,19 @@ public class ConfigManager {
     }
 
     public static void reload() {
-        getPluginConfig().reload();
+        try {
-        getMessageConfig().reload();
+            getPluginConfig().reload();
-        PluginConfig.PERMISSIONS.clearCache();
+            getMessageConfig().reload();
+        } catch (Exception ignored) {
+        }
     }
 
     public static void saveConfig() {
-        getPluginConfig().save();
+        try {
-        getMessageConfig().save();
+            getPluginConfig().save();
+            getMessageConfig().save();
+        } catch (Exception ignored) {
+        }
     }
 
 

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

@@ -1,6 +1,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.PluginConfig;
 import cc.carm.plugin.moeteleport.configuration.PluginMessages;
 import cc.carm.plugin.moeteleport.model.TeleportRequest;
@@ -33,16 +34,16 @@ public class RequestManager {
     }
 
     public void checkRequests() {
-        Main.getUserManager().getUserDataMap().values()
+        MoeTeleport.getUserManager().getUserDataMap().values()
                 .forEach(data -> data.getReceivedRequests().entrySet().stream()
                         .filter(entry -> entry.getValue().isExpired())
-                        .peek(entry -> PluginMessages.Request.SENT_TIMEOUT.sendWithPlaceholders(
+                        .peek(entry -> {
-                                entry.getValue().getSender(), new String[]{"%(player)"},
+                            Player sender = entry.getValue().getSender();
-                                new Object[]{entry.getValue().getReceiver().getName()}))
+                            Player receiver = entry.getValue().getReceiver();
-                        .peek(entry -> PluginMessages.Request.RECEIVED_TIMEOUT.sendWithPlaceholders(
+                            PluginMessages.Requests.SENT_TIMEOUT.send(sender, receiver.getName());
-                                entry.getValue().getReceiver(), new String[]{"%(player)"},
+                            PluginMessages.Requests.RECEIVED_TIMEOUT.send(receiver, sender.getName());
-                                new Object[]{entry.getValue().getSender().getName()}))
+                        })
-                        .peek(entry -> Main.getUserManager()
+                        .peek(entry -> MoeTeleport.getUserManager()
                                 .getData(entry.getValue().getSender()).getSentRequests()
                                 .remove(entry.getKey()))
                         .forEach(entry -> data.getReceivedRequests().remove(entry.getKey()))
@@ -52,84 +53,59 @@ public class RequestManager {
     public void sendRequest(Player sender, Player receiver, TeleportRequest.RequestType type) {
         int expireTime = PluginConfig.EXPIRE_TIME.get();
 
-        PluginMessages.Request.SENT.sendWithPlaceholders(sender,
+        PluginMessages.Requests.SENT.send(sender, receiver.getName(), expireTime);
-                new String[]{"%(player)", "%(expire)"},
-                new Object[]{receiver.getName(), expireTime}
-        );
 
         switch (type) {
             case TPA: {
-                PluginMessages.TPA.sendWithPlaceholders(receiver,
+                PluginMessages.Requests.RECEIVED_TP_HERE.send(receiver, sender.getName(), expireTime);
-                        new String[]{"%(player)", "%(expire)"},
-                        new Object[]{sender.getName(), expireTime}
-                );
                 break;
             }
             case TPA_HERE: {
-                PluginMessages.TPA_HERE.sendWithPlaceholders(receiver,
+                PluginMessages.Requests.RECEIVED_TP_TO.send(receiver, sender.getName(), expireTime);
-                        new String[]{"%(player)", "%(expire)"},
-                        new Object[]{sender.getName(), expireTime}
-                );
                 break;
             }
         }
 
         TeleportRequest request = new TeleportRequest(sender, receiver, type);
-        Main.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
+        MoeTeleport.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
-        Main.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
+        MoeTeleport.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
 
     }
 
     public void acceptRequest(TeleportRequest request) {
-        PluginMessages.ACCEPTED.sendWithPlaceholders(request.getSender(),
+        PluginMessages.Requests.WAS_ACCEPTED.send(request.getSender(), request.getReceiver().getName());
-                new String[]{"%(player)"},
+        PluginMessages.Requests.ACCEPTED.send(request.getReceiver(), request.getSender().getName());
-                new Object[]{request.getReceiver().getName()}
-        );
-        PluginMessages.TP_ACCEPT.sendWithPlaceholders(request.getReceiver(),
-                new String[]{"%(player)"},
-                new Object[]{request.getSender().getName()}
-        );
         TeleportManager.teleport(request.getTeleportPlayer(), request.getTeleportLocation(), true);
         removeRequests(request);
     }
 
     public void denyRequest(TeleportRequest request) {
-        PluginMessages.DENIED.sendWithPlaceholders(request.getSender(),
+        PluginMessages.Requests.WAS_DENIED.send(request.getSender(), request.getReceiver().getName());
-                new String[]{"%(player)"},
+        PluginMessages.Requests.DENIED.send(request.getReceiver(), request.getSender().getName());
-                new Object[]{request.getReceiver().getName()}
-        );
-        PluginMessages.TP_DENY.sendWithPlaceholders(request.getReceiver(),
-                new String[]{"%(player)"},
-                new Object[]{request.getSender().getName()}
-        );
         removeRequests(request);
     }
 
     public void removeRequests(TeleportRequest request) {
-        Main.getUserManager().getData(request.getSender())
+        MoeTeleport.getUserManager().getData(request.getSender())
                 .getSentRequests()
                 .remove(request.getReceiver().getUniqueId());
-        Main.getUserManager().getData(request.getReceiver())
+        MoeTeleport.getUserManager().getData(request.getReceiver())
                 .getReceivedRequests()
                 .remove(request.getSender().getUniqueId());
     }
 
     public void cancelAllRequests(Player player) {
         UUID playerUUID = player.getUniqueId();
-        UserData data = Main.getUserManager().getData(player);
+        UserData data = MoeTeleport.getUserManager().getData(player);
         data.getReceivedRequests().keySet().stream()
-                .peek(senderUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
+                .peek(senderUUID -> PluginMessages.Requests.OFFLINE.send(Bukkit.getPlayer(senderUUID), player.getName()))
-                        Bukkit.getPlayer(senderUUID),
+                .map(senderUUID -> MoeTeleport.getUserManager().getData(senderUUID))
-                        new String[]{"%(player)"}, new Object[]{player.getName()}
-                )).map(senderUUID -> Main.getUserManager().getData(senderUUID))
                 .filter(Objects::nonNull).map(UserData::getSentRequests)
                 .forEach(receivers -> receivers.remove(playerUUID));
 
         data.getSentRequests().stream()
-                .peek(receiverUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
+                .peek(receiverUUID -> PluginMessages.Requests.OFFLINE.send(Bukkit.getPlayer(receiverUUID), player.getName()))
-                        Bukkit.getPlayer(receiverUUID),
+                .map(receiverUUID -> MoeTeleport.getUserManager().getData(receiverUUID))
-                        new String[]{"%(player)"}, new Object[]{player.getName()}
-                )).map(receiverUUID -> Main.getUserManager().getData(receiverUUID))
                 .filter(Objects::nonNull).map(UserData::getReceivedRequests)
                 .forEach(senders -> senders.remove(playerUUID));
 

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

@@ -1,6 +1,6 @@
 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.configuration.PluginMessages;
 import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
@@ -14,10 +14,7 @@ public class TeleportManager {
     public static void teleport(Player player, DataLocation targetLocation, boolean onlySafety) {
         Location location = targetLocation.getBukkitLocation();
         if (location == null) {
-            PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
+            PluginMessages.Teleport.NOT_AVAILABLE.send(player, targetLocation.toFlatString());
-                    new String[]{"%(location)"},
-                    new Object[]{targetLocation.toFlatString()}
-            );
         } else {
             teleport(player, location, onlySafety);
         }
@@ -26,20 +23,14 @@ public class TeleportManager {
     public static void teleport(Player player, Location targetLocation, boolean onlySafety) {
         if (targetLocation.isWorldLoaded()) {
             if (!onlySafety || TeleportManager.isSafeLocation(targetLocation)) {
-                Main.getUserManager().getData(player).setLastLocation(player.getLocation());
+                MoeTeleport.getUserManager().getData(player).setLastLocation(player.getLocation());
                 player.teleport(targetLocation);
-                PluginMessages.TELEPORTING.sendWithPlaceholders(player,
+                PluginMessages.Teleport.TELEPORTING.send(player, new DataLocation(targetLocation).toFlatString());
-                        new String[]{"%(location)"},
-                        new Object[]{new DataLocation(targetLocation).toFlatString()}
-                );
             } else {
-                PluginMessages.DANGEROUS.send(player);
+                PluginMessages.Teleport.NOT_SAFE.send(player, new DataLocation(targetLocation).toFlatString());
             }
         } else {
-            PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
+            PluginMessages.Teleport.NOT_SAFE.send(player, new DataLocation(targetLocation).toFlatString());
-                    new String[]{"%(location)"},
-                    new Object[]{new DataLocation(targetLocation).toFlatString()}
-            );
         }
     }
 

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

@@ -1,33 +1,117 @@
 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.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataStorage;
+import cc.carm.plugin.moeteleport.util.DataTaskRunner;
+import com.google.common.collect.ImmutableMap;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
 public class UserManager {
 
-    private final File dataFolder;
+    private final HashMap<UUID, UserData> userDataMap;
 
-    private final HashMap<UUID, UserData> userDataMap = new HashMap<>();
+    public UserManager() {
+        this.userDataMap = new HashMap<>();
+    }
 
-    public UserManager(Main main) {
+    private static int getMaxValue(Player player, Map<Integer, String> permissions, int defaultValue) {
-        this.dataFolder = new File(main.getDataFolder() + "/data");
+        int current = defaultValue;
-        if (!dataFolder.isDirectory() || !dataFolder.exists()) {
+
-            boolean success = dataFolder.mkdir();
+        for (Map.Entry<Integer, String> entry : permissions.entrySet()) {
+            if (entry.getKey() > current && player.hasPermission(entry.getValue())) {
+                current = entry.getKey();
+            }
         }
+
+        return current;
     }
 
     @NotNull
-    public UserData loadData(UUID userUUID) {
+    public UserData readData(UUID userUUID) {
-        return new UserData(getDataFolder(), userUUID);
+        try {
+            long start = System.currentTimeMillis();
+            DataStorage storage = MoeTeleport.getStorage();
+            Main.debugging("正通过 " + storage.getClass().getSimpleName() + " 读取 " + userUUID + " 的用户数据...(" + System.currentTimeMillis() + ")");
+
+            UserData data = storage.loadData(userUUID);
+
+            if (data == null) {
+                Main.debugging("当前还不存在玩家 " + userUUID + " 的数据，视作新档。");
+                return new UserData(userUUID);
+            }
+
+            Main.debugging("通过 " + storage.getClass().getSimpleName() + "读取 " + userUUID + " 的用户数据完成，"
+                    + "耗时 " + (System.currentTimeMillis() - start) + "ms。");
+
+            return data;
+        } catch (Exception e) {
+            Main.serve("无法正常读取玩家数据，玩家操作将不会被保存，请检查数据配置！");
+            Main.serve("Could not load user's data, please check the data configuration!");
+            e.printStackTrace();
+            return new UserData(userUUID);
+        }
+    }
+
+    public void saveData(UserData data) {
+        try {
+            long start = System.currentTimeMillis();
+            DataStorage storage = MoeTeleport.getStorage();
+
+            Main.debugging("正通过 " + storage.getClass().getSimpleName() + " 保存 " + data.getUserUUID() + " 的用户数据...(" + System.currentTimeMillis() + ")");
+            storage.saveUserData(data);
+
+            Main.debugging("通过 " + storage.getClass().getSimpleName() + " 保存 " + data.getUserUUID() + " 的用户数据完成，" +
+                    "耗时 " + (System.currentTimeMillis() - start) + "ms。");
+
+        } catch (Exception e) {
+            Main.serve("无法正常保存玩家数据，请检查数据配置！");
+            Main.serve("Could not save user's data, please check the data configuration!");
+            e.printStackTrace();
+        }
+    }
+
+    public void loadData(UUID userUUID) {
+        getUserDataMap().put(userUUID, readData(userUUID));
+    }
+
+    public void unloadData(UUID userUUID) {
+        unloadData(userUUID, true);
+    }
+
+    public void unloadData(UUID userUUID, boolean save) {
+        UserData data = getData(userUUID);
+        if (data == null) return;
+        if (save) saveData(data);
+        getUserDataMap().remove(userUUID);
+    }
+
+    public void loadAll() {
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            if (getUserDataMap().containsKey(player.getUniqueId())) continue;
+            loadData(player.getUniqueId());
+        }
+    }
+
+    public void saveAll() {
+        getUserDataMap().values().forEach(this::saveData);
+    }
+
+    public void unloadAll(boolean save) {
+        if (save) saveAll();
+        getUserDataMap().clear();
     }
 
     @Nullable
@@ -40,25 +124,43 @@ public class UserManager {
         return getUserDataMap().get(player.getUniqueId());
     }
 
-    public int getMaxHome(Player player) {
+    public long countUserWarps(UUID userUUID) {
-        Map<Integer, String> permissions = PluginConfig.PERMISSIONS.get();
+        return MoeTeleport.getWarpManager().listWarps().values().stream()
-        int current = PluginConfig.DEFAULT_HOME.get();
+                .map(WarpInfo::getOwner).filter(Objects::nonNull)
-
+                .filter(ownerUUID -> ownerUUID.equals(userUUID))
-        for (Map.Entry<Integer, String> entry : permissions.entrySet()) {
+                .count();
-            if (entry.getKey() > current && player.hasPermission(
-                    Main.getInstance().getName() + "." + entry.getValue()
-            )) {
-                current = entry.getKey();
-            }
-        }
-        return current;
     }
 
-    public HashMap<UUID, UserData> getUserDataMap() {
+    public int getMaxHome(Player player) {
+        return getMaxValue(player, PluginConfig.HOME_PERMISSIONS.get(), PluginConfig.DEFAULT_HOME.get());
+    }
+
+    public int getMaxWarps(Player player) {
+        return getMaxValue(player, PluginConfig.WARP_PERMISSIONS.get(), PluginConfig.DEFAULT_WARP.get());
+    }
+
+    public void editData(@NotNull DataTaskRunner task) {
+        try {
+            task.run(MoeTeleport.getStorage());
+        } catch (Exception exception) {
+            Main.serve("无法正常更改玩家数据，请检查数据配置！");
+            Main.serve("Could not edit user's data, please check the data configuration!");
+            exception.printStackTrace();
+        }
+    }
+
+    public void editDataAsync(@NotNull DataTaskRunner task) {
+        Main.getInstance().getScheduler().runAsync(() -> editData(task));
+    }
+
+    @NotNull
+    @Unmodifiable
+    public Map<UUID, UserData> listUserData() {
+        return ImmutableMap.copyOf(getUserDataMap());
+    }
+
+    protected @NotNull HashMap<UUID, UserData> getUserDataMap() {
         return userDataMap;
     }
 
-    public File getDataFolder() {
-        return dataFolder;
-    }
 }

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

@@ -0,0 +1,86 @@
+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.model.WarpInfo;
+import com.google.common.collect.ImmutableMap;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Map;
+import java.util.UUID;
+
+public class WarpManager {
+
+    public void saveWarps() {
+        try {
+            MoeTeleport.getStorage().saveWarps();
+        } catch (Exception exception) {
+            Main.serve("保存地标数据失败，请检查配置文件。");
+            exception.printStackTrace();
+        }
+    }
+
+    public void setWarp(@NotNull String name, @Nullable UUID owner, @NotNull Location location) {
+        setWarp(name, owner, new DataLocation(location));
+    }
+
+    public void setWarp(@NotNull String name, @Nullable UUID owner, @NotNull DataLocation location) {
+
+        try {
+            MoeTeleport.getStorage().setWarp(name, new WarpInfo(name,owner, location));
+        } catch (Exception exception) {
+            Main.serve("保存地标数据 " + name + " 失败，请检查配置文件。");
+            exception.printStackTrace();
+        }
+
+    }
+
+    public void setWarpAsync(@NotNull String name, @Nullable UUID owner, @NotNull Location location) {
+        Main.getInstance().getScheduler().runAsync(() -> setWarp(name, owner, location));
+    }
+
+    public void setWarpAsync(@NotNull String name, @Nullable UUID owner, @NotNull DataLocation location) {
+        Main.getInstance().getScheduler().runAsync(() -> setWarp(name, owner, location));
+    }
+
+    public void delWarp(@NotNull String name) {
+        try {
+            MoeTeleport.getStorage().delWarp(name);
+        } catch (Exception exception) {
+            Main.serve("删除地标数据 " + name + " 失败，请检查配置文件。");
+            exception.printStackTrace();
+        }
+    }
+
+    public void delWarpAsync(@NotNull String name) {
+        Main.getInstance().getScheduler().runAsync(() -> delWarp(name));
+    }
+
+    public WarpInfo getWarp(@NotNull String name) {
+        return listWarps().entrySet().stream()
+                .filter(entry -> entry.getKey().equalsIgnoreCase(name))
+                .map(Map.Entry::getValue)
+                .findFirst().orElse(null);
+    }
+
+    public boolean hasWarp(@NotNull String name) {
+        return MoeTeleport.getStorage().hasWarp(name);
+    }
+
+    @NotNull
+    @Unmodifiable
+    public Map<String, WarpInfo> listWarps() {
+        return ImmutableMap.copyOf(getWarpsMap());
+    }
+
+    @NotNull
+    protected Map<String, WarpInfo> getWarpsMap() {
+        return MoeTeleport.getStorage().getWarps();
+    }
+
+
+}

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

@@ -1,54 +1,37 @@
 package cc.carm.plugin.moeteleport.model;
 
-import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.MoeTeleport;
 import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
 import org.bukkit.Location;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class UserData {
 
-    private final @NotNull File dataFile;
+    protected final @NotNull UUID userUUID;
-    private final @NotNull FileConfiguration dataConfig;
+    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;
-    private LinkedHashMap<String, DataLocation> homeLocations;
 
-    public UserData(@NotNull File dataFolder, @NotNull UUID uuid) {
+    public UserData(@NotNull UUID userUUID) {
-        this(new File(dataFolder, uuid + ".yml"));
+        this(userUUID, null, new LinkedHashMap<>());
     }
 
-    public UserData(@NotNull File file) {
+    public UserData(@NotNull UUID userUUID,
-        if (!file.exists()) {
+                    @Nullable DataLocation lastLocation,
-            try {
+                    @NotNull LinkedHashMap<String, DataLocation> homeLocations) {
-                boolean success = file.createNewFile();
+        this.userUUID = userUUID;
-            } catch (IOException e) {
+        this.lastLocation = Optional.ofNullable(lastLocation).map(DataLocation::getBukkitLocation).orElse(null);
-                Main.error("在加载用户 " + file.getName() + " 的数据时出现异常。");
+        this.homeLocations = homeLocations;
-                Main.error(e.getLocalizedMessage());
-            }
-        }
-        this.dataFile = file;
-        this.dataConfig = YamlConfiguration.loadConfiguration(dataFile);
-        loadHomeData();
     }
 
-    public void loadHomeData() {
+    public @NotNull UUID getUserUUID() {
-        LinkedHashMap<String, DataLocation> data = new LinkedHashMap<>();
+        return userUUID;
-        Optional.ofNullable(getDataConfig().getConfigurationSection("homes"))
-                .ifPresent(section -> section.getKeys(false).forEach(homeName -> {
-                    DataLocation location = DataLocation.deserializeText(section.getString(homeName));
-                    if (location != null) data.put(homeName, location);
-                }));
-        this.homeLocations = data;
     }
 
     public LinkedHashMap<String, DataLocation> getHomeLocations() {
@@ -58,11 +41,13 @@ public class UserData {
     public void setHomeLocation(String homeName, Location location) {
         delHomeLocation(homeName);
         getHomeLocations().put(homeName, new DataLocation(location));
+        MoeTeleport.getUserManager().editData((storage) -> storage.setHome(userUUID, homeName, new DataLocation(location)));
     }
 
     public void delHomeLocation(String homeName) {
         Map.Entry<String, DataLocation> lastLocation = getHomeLocation(homeName);
         if (lastLocation != null) getHomeLocations().remove(lastLocation.getKey());
+        MoeTeleport.getUserManager().editData((storage) -> storage.delHome(userUUID, homeName));
     }
 
     public Map.Entry<String, DataLocation> getHomeLocation(@Nullable String homeName) {
@@ -104,29 +89,4 @@ public class UserData {
         this.enableAutoSelect = enableAutoSelect;
     }
 
-    public @NotNull File getDataFile() {
-        return dataFile;
-    }
-
-    public @NotNull FileConfiguration getDataConfig() {
-        return dataConfig;
-    }
-
-    public LinkedHashMap<String, String> saveToMap() {
-        LinkedHashMap<String, DataLocation> homeLocations = getHomeLocations();
-        LinkedHashMap<String, String> data = new LinkedHashMap<>();
-        if (homeLocations.isEmpty()) return data;
-        homeLocations.forEach((name, loc) -> data.put(name, loc.serializeToText()));
-        return data;
-    }
-
-    public void save() {
-        try {
-            getDataConfig().createSection("homes", saveToMap());
-            getDataConfig().save(getDataFile());
-        } catch (Exception ex) {
-            Main.error("在保存 " + getDataFile().getName() + " 时出现异常。");
-            Main.error(ex.getLocalizedMessage());
-        }
-    }
 }

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

@@ -0,0 +1,47 @@
+package cc.carm.plugin.moeteleport.model;
+
+import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+
+public class WarpInfo {
+
+    private final @NotNull String name;
+    private final @Nullable UUID owner;
+    private final @NotNull DataLocation location;
+
+    public WarpInfo(@NotNull String name, @Nullable UUID owner, @NotNull DataLocation location) {
+        this.name = name;
+        this.owner = owner;
+        this.location = location;
+    }
+
+    public @NotNull String getName() {
+        return name;
+    }
+
+    public @Nullable UUID getOwner() {
+        return owner;
+    }
+
+    public @Nullable String getOwnerName() {
+        if (getOwner() != null) {
+            OfflinePlayer offline = Bukkit.getOfflinePlayer(getOwner());
+            if (offline.getName() != null) {
+                return offline.getName();
+            }
+        }
+        return null;
+    }
+
+
+    public @NotNull DataLocation getLocation() {
+        return location;
+    }
+
+}
+

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

@@ -0,0 +1,42 @@
+package cc.carm.plugin.moeteleport.storage;
+
+import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import org.bukkit.Location;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class DataSerializer {
+
+    public static Map<String, String> serializeLocationsMap(LinkedHashMap<String, DataLocation> data) {
+        LinkedHashMap<String, String> after = new LinkedHashMap<>();
+        if (data == null || data.isEmpty()) return after;
+        data.forEach((name, loc) -> after.put(name, loc.serializeToText()));
+        return after;
+    }
+
+    public static @Nullable String serializeLocation(@Nullable DataLocation loc) {
+        return Optional.ofNullable(loc).map(DataLocation::serializeToText).orElse(null);
+    }
+
+    public static @Nullable String serializeLocation(@Nullable Location loc) {
+        return serializeLocation(Optional.ofNullable(loc).map(DataLocation::new).orElse(null));
+    }
+
+    public static Map<String, Object> serializeWarpMap(WarpInfo info) {
+        LinkedHashMap<String, Object> after = new LinkedHashMap<>();
+        if (info.getOwner() != null) after.put("owner", info.getOwner().toString());
+        after.put("world", info.getLocation().getWorldName());
+        after.put("x", info.getLocation().getX());
+        after.put("y", info.getLocation().getY());
+        after.put("z", info.getLocation().getZ());
+        after.put("yaw", info.getLocation().getYaw());
+        after.put("pitch", info.getLocation().getPitch());
+        return after;
+    }
+
+
+}

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

@@ -0,0 +1,86 @@
+package cc.carm.plugin.moeteleport.storage;
+
+import cc.carm.plugin.moeteleport.configuration.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;
+
+import java.util.Map;
+import java.util.UUID;
+
+public interface DataStorage {
+
+    /**
+     * 在插件加载存储源时执行。
+     *
+     * @return 是否初始化成功
+     */
+    boolean initialize();
+
+    /**
+     * 在插件被卸载时执行。
+     */
+    void shutdown();
+
+    /**
+     * 用于加载用户数据的方法。<b>该方法将会被异步运行！</b>
+     * <br>该方法一般无需自行执行，见 {@link UserManager#loadData(UUID)}
+     * <br>
+     * <br>若不存在该用户的数据，请返回 null 。
+     * <br>若加载出现任何错误，请抛出异常。
+     *
+     * @param uuid 用户UUID
+     * @throws Exception 当出现任何错误时抛出
+     */
+    @Nullable
+    UserData loadData(@NotNull UUID uuid) throws Exception;
+
+    /**
+     * 用于保存用户数据的方法。 <b>该方法将会被异步运行！</b>
+     * <br>该方法一般无需自行执行，见 {@link UserManager#saveData(UserData)}
+     *
+     * @param data 用户数据
+     * @throws Exception 当出现任何错误时抛出
+     */
+    void saveUserData(@NotNull UserData data) throws Exception;
+
+    Map<String, WarpInfo> getWarps();
+
+    default void saveWarps() throws Exception {
+        saveWarps(getWarps());
+    }
+
+    void saveWarps(@NotNull Map<String, WarpInfo> warps) throws Exception;
+
+    void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) throws Exception;
+
+    boolean delWarp(@NotNull String name) throws Exception;
+
+    default boolean hasWarp(@NotNull String name) {
+        return getWarps().containsKey(name);
+    }
+
+    /**
+     * 为某用户设定一个家的位置。
+     *
+     * @param uuid         用户UUID
+     * @param homeName     家的名称
+     * @param homeLocation 家的位置
+     * @throws Exception 当出现任何错误时抛出
+     */
+    void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) throws Exception;
+
+
+    /**
+     * 为某用户移除一个家的位置。
+     *
+     * @param uuid     用户UUID
+     * @param homeName 家的名称
+     * @return 是否有一个家被移除
+     * @throws Exception 当出现任何错误时抛出
+     */
+    boolean delHome(@NotNull UUID uuid, @NotNull String homeName) throws Exception;
+
+}

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

@@ -0,0 +1,79 @@
+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.EssentialStorage;
+import cc.carm.plugin.moeteleport.storage.file.JSONStorage;
+import cc.carm.plugin.moeteleport.storage.file.YAMLStorage;
+import org.jetbrains.annotations.NotNull;
+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),
+    YAML(1, new String[]{"yml"}, YAMLStorage::new),
+    JSON(2, new String[]{}, JSONStorage::new),
+    MYSQL(3, new String[]{"my-sql", "mariadb", "sql", "database"}, MySQLStorage::new),
+
+    ESSENTIALS(11, new String[]{"essential", "ess", "EssentialsX", "essX"}, EssentialStorage::new);
+
+    private final int id;
+    private final String[] alias;
+    private @NotNull Supplier<@NotNull DataStorage> storageSupplier;
+
+    StorageMethod(int id, String[] alias, @NotNull Supplier<@NotNull DataStorage> storageSupplier) {
+        this.id = id;
+        this.alias = alias;
+        this.storageSupplier = storageSupplier;
+    }
+
+    public static @NotNull StorageMethod read(String s) {
+        StorageMethod byName = readByName(s);
+        if (byName != null) return byName;
+        StorageMethod byAlias = readByAlias(s);
+        if (byAlias != null) return byAlias;
+        try {
+            return Optional.ofNullable(readByID(Integer.parseInt(s))).orElse(YAML);
+        } catch (Exception ex) {
+            return YAML;
+        }
+    }
+
+    public static @Nullable StorageMethod readByName(String name) {
+        return Arrays.stream(values()).filter(value -> value.name().equalsIgnoreCase(name)).findFirst().orElse(null);
+    }
+
+    public static @Nullable StorageMethod readByAlias(String name) {
+        return Arrays.stream(values())
+                .filter(value -> Arrays.stream(value.getAlias()).anyMatch(alias -> alias.equalsIgnoreCase(name)))
+                .findFirst().orElse(null);
+    }
+
+    public static @Nullable StorageMethod readByID(int id) {
+        return Arrays.stream(values()).filter(value -> value.getID() == id).findFirst().orElse(null);
+    }
+
+    public int getID() {
+        return id;
+    }
+
+    public String[] getAlias() {
+        return alias;
+    }
+
+    public @NotNull Supplier<@NotNull DataStorage> getStorageSupplier() {
+        return storageSupplier;
+    }
+
+    public void setStorageSupplier(@NotNull Supplier<@NotNull DataStorage> storageSupplier) {
+        this.storageSupplier = storageSupplier;
+    }
+
+    public @NotNull DataStorage createStorage() {
+        return getStorageSupplier().get();
+    }
+}

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

@@ -0,0 +1,73 @@
+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.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataStorage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class CustomStorage implements DataStorage {
+
+    @Override
+    @TestOnly
+    public boolean initialize() {
+        Main.serve("您选择使用自定义存储，但并没有应用成功。");
+        Main.serve("You are using CustomStorage, but not overwrite the methods.");
+        return false;
+    }
+
+    @Override
+    @TestOnly
+    public void shutdown() {
+
+    }
+
+    @Override
+    @TestOnly
+    public @Nullable UserData loadData(@NotNull UUID uuid) {
+        return null;
+    }
+
+    @Override
+    @TestOnly
+    public void saveUserData(@NotNull UserData data) {
+
+    }
+
+    @Override
+    public Map<String, WarpInfo> getWarps() {
+        return new HashMap<>();
+    }
+
+    @Override
+    public void saveWarps(@NotNull Map<String, WarpInfo> warps) {
+
+    }
+
+    @Override
+    public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) {
+
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) {
+        return true;
+    }
+
+    @Override
+    public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) throws Exception {
+    }
+
+    @Override
+    public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) {
+        return true;
+    }
+
+}

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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,73 @@
+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/MySQLStorage.java

@@ -0,0 +1,233 @@
+package cc.carm.plugin.moeteleport.storage.database;
+
+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.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataStorage;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class MySQLStorage implements DataStorage {
+
+    SQLManager sqlManager;
+
+    Map<String, WarpInfo> warpsMap = new HashMap<>();
+
+    @Override
+    public boolean initialize() {
+        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,
+                    DBConfiguration.USERNAME.get(), DBConfiguration.PASSWORD.get()
+            );
+            this.sqlManager.setDebugMode(() -> Main.getInstance().isDebugging());
+        } catch (Exception exception) {
+            Main.serve("无法连接到数据库，请检查配置文件。");
+            exception.printStackTrace();
+            return false;
+        }
+
+        try {
+            Main.info("	创建插件所需表...");
+            getSQLManager().createTable(DBTables.UserLastLocations.TABLE_NAME.get())
+                    .setColumns(DBTables.UserLastLocations.TABLE_COLUMNS)
+                    .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("无法创建插件所需的表，请检查数据库权限。");
+            exception.printStackTrace();
+            return false;
+        }
+
+        Main.info("	加载地标数据...");
+        try {
+            this.warpsMap = loadWarps();
+        } catch (Exception e) {
+            Main.serve("无法加载地标数据，请检查数据库权限和相关表。");
+            e.printStackTrace();
+        }
+
+        return true;
+    }
+
+    @Override
+    public void shutdown() {
+        Main.info("	关闭数据库连接...");
+        EasySQL.shutdownManager(getSQLManager());
+        this.sqlManager = null;
+    }
+
+    @Override
+    public @Nullable UserData loadData(@NotNull UUID uuid) throws Exception {
+        LinkedHashMap<String, DataLocation> homes = loadHomes(uuid);
+        DataLocation lastLocation = loadLastLocation(uuid);
+        return new UserData(uuid, lastLocation, homes);
+    }
+
+    @Override
+    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())
+                    .setColumnNames("uuid", "world", "x", "y", "z", "yaw", "pitch")
+                    .setParams(
+                            data.getUserUUID(), location.getWorld().getName(),
+                            location.getX(), location.getY(), location.getZ(),
+                            location.getYaw(), location.getPitch()
+                    ).execute();
+        } else {
+            getSQLManager().createDelete(DBTables.UserLastLocations.TABLE_NAME.get())
+                    .addCondition("uuid", data.getUserUUID()).setLimit(1)
+                    .build().execute();
+        }
+    }
+
+    @Override
+    public Map<String, WarpInfo> getWarps() {
+        return this.warpsMap;
+    }
+
+    @Override
+    public void saveWarps(@NotNull Map<String, WarpInfo> warps) {
+        // 单独保存，不需要统一存储
+    }
+
+    private @NotNull LinkedHashMap<String, DataLocation> loadHomes(@NotNull UUID uuid) throws Exception {
+        return getSQLManager().createQuery().inTable(DBTables.UserHomes.TABLE_NAME.get())
+                .addCondition("uuid", uuid).build()
+                .executeFunction((query) -> {
+                    LinkedHashMap<String, DataLocation> homes = new LinkedHashMap<>();
+                    ResultSet resultSet = query.getResultSet();
+                    if (resultSet == null) return homes;
+                    while (resultSet.next()) {
+                        String name = resultSet.getString("name");
+                        if (name == null) continue;
+                        homes.put(name, new DataLocation(
+                                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())
+                .addCondition("uuid", uuid).setLimit(1).build()
+                .executeFunction((query) -> {
+                    ResultSet resultSet = query.getResultSet();
+                    if (resultSet == null || !resultSet.next()) return null;
+                    return new DataLocation(
+                            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())
+                .orderBy("id", true).build().executeFunction((query) -> {
+                    LinkedHashMap<String, WarpInfo> warps = new LinkedHashMap<>();
+                    ResultSet resultSet = query.getResultSet();
+                    if (resultSet == null) return warps;
+                    while (resultSet.next()) {
+                        String uuidString = resultSet.getString("owner");
+                        UUID uuid = uuidString == null ? null : UUIDUtil.toUUID(uuidString);
+                        String name = resultSet.getString("name");
+                        DataLocation location = new DataLocation(
+                                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;
+                }, new LinkedHashMap<>());
+    }
+
+    @Override
+    public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation location) throws Exception {
+        getSQLManager().createReplace(DBTables.UserHomes.TABLE_NAME.get())
+                .setColumnNames("uuid", "name", "world", "x", "y", "z", "yaw", "pitch")
+                .setParams(
+                        uuid, homeName, location.getWorldName(),
+                        location.getX(), location.getY(), location.getZ(),
+                        location.getYaw(), location.getPitch()
+                ).execute();
+    }
+
+
+    @Override
+    public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) throws Exception {
+        return getSQLManager().createDelete(DBTables.UserHomes.TABLE_NAME.get())
+                .addCondition("uuid", uuid)
+                .addCondition("name", homeName)
+                .setLimit(1)
+                .build().executeFunction((i) -> i > 0, false);
+    }
+
+    @Override
+    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())
+                .setColumnNames("name", "owner", "world", "x", "y", "z", "yaw", "pitch")
+                .setParams(
+                        name, warpInfo.getOwner(), location.getWorldName(),
+                        location.getX(), location.getY(), location.getZ(),
+                        location.getYaw(), location.getPitch()
+                ).execute();
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) throws Exception {
+        String actualName = this.warpsMap.keySet().stream().filter(s -> s.equalsIgnoreCase(name)).findFirst().orElse(null);
+        if (actualName == null) return false;
+
+        this.warpsMap.remove(actualName);
+        return getSQLManager().createDelete(DBTables.Warps.TABLE_NAME.get())
+                .addCondition("name", actualName).setLimit(1)
+                .build().executeFunction((i) -> i > 0, false);
+    }
+
+    public SQLManager getSQLManager() {
+        return sqlManager;
+    }
+
+
+}

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

@@ -0,0 +1,129 @@
+package cc.carm.plugin.moeteleport.storage.extension;
+
+import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.impl.PluginBasedStorage;
+import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.User;
+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 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());
+    }
+
+    @Override
+    public Map<String, WarpInfo> getWarps() {
+        Map<String, WarpInfo> warps = new LinkedHashMap<>();
+
+        for (String warpName : getEssentials().getWarps().getList()) {
+            try {
+                Location warpLocation = getEssentials().getWarps().getWarp(warpName);
+                UUID owner = getEssentials().getWarps().getLastOwner(warpName);
+                warps.put(warpName, new WarpInfo(warpName,owner, new DataLocation(warpLocation)));
+            } catch (Exception ignore) {
+            }
+        }
+
+        return warps;
+    }
+
+    @Override
+    public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) throws Exception {
+        User user = getEssentials().getUser(warpInfo.getOwner());
+        Location location = warpInfo.getLocation().getBukkitLocation();
+        if (location == null) return;
+
+        if (user == null) {
+            getEssentials().getWarps().setWarp(name, location);
+        } else {
+            getEssentials().getWarps().setWarp(user, name, warpInfo.getLocation().getBukkitLocation());
+        }
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) throws Exception {
+        boolean has = hasWarp(name);
+        getEssentials().getWarps().removeWarp(name);
+        return has;
+    }
+
+    @Override
+    public boolean hasWarp(@NotNull String name) {
+        return getEssentials().getWarps().isWarp(name);
+    }
+
+    public Essentials getEssentials() {
+        return essentials;
+    }
+
+    public static class EssentialUserData extends UserData {
+
+        User essentialsUser;
+
+        public EssentialUserData(@NotNull UUID userUUID, Essentials essentials) {
+            super(userUUID);
+            this.essentialsUser = essentials.getUser(userUUID);
+        }
+
+        public User getEssUser() {
+            return essentialsUser;
+        }
+
+        @Override
+        public LinkedHashMap<String, DataLocation> getHomeLocations() {
+            LinkedHashMap<String, DataLocation> homes = new LinkedHashMap<>();
+            getEssUser().getHomes().forEach(homeName -> {
+                Location homeLocation = getEssUser().getHome(homeName);
+                if (homeLocation != null) homes.put(homeName, new DataLocation(homeLocation));
+            });
+            return homes;
+        }
+
+        @Override
+        public void setHomeLocation(String homeName, Location location) {
+            getEssUser().setHome(homeName, location);
+        }
+
+        @Override
+        public void delHomeLocation(String homeName) {
+            try {
+                getEssUser().delHome(homeName);
+            } catch (Exception ignored) {
+            }
+        }
+
+        @Override
+        public @Nullable Location getLastLocation() {
+            return getEssUser().getLastLocation();
+        }
+
+        @Override
+        public void setLastLocation(@Nullable Location lastLocation) {
+            getEssUser().setLastLocation(lastLocation);
+        }
+
+
+    }
+
+}

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

@@ -0,0 +1,150 @@
+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.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataSerializer;
+import cc.carm.plugin.moeteleport.storage.impl.FileBasedStorage;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class JSONStorage extends FileBasedStorage {
+
+    protected static final Gson GSON = new Gson();
+    protected static final JsonParser PARSER = new JsonParser();
+
+    Map<String, WarpInfo> warpsMap = new HashMap<>();
+
+    @Override
+    public boolean initialize() {
+        if (super.initialize()) {
+            try {
+                this.warpsMap = loadWarps();
+                return true;
+            } catch (Exception e) {
+                Main.serve("无法加载地标数据，请检查文件权限和相关配置。");
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public @Nullable UserData loadData(@NotNull UUID uuid) throws Exception {
+        File userDataFile = new File(getDataFolder(), uuid + ".json");
+        if (!userDataFile.exists()) {
+            Main.debugging("当前文件夾内不存在玩家 " + uuid + " 的数据，视作新档。");
+            return null;
+        }
+
+        JsonElement dataElement = PARSER.parse(new FileReader(userDataFile));
+        if (!dataElement.isJsonObject()) throw new NullPointerException(userDataFile.getName());
+
+        JsonObject dataObject = dataElement.getAsJsonObject();
+        DataLocation lastLocation = null;
+        if (dataObject.has("lastLocation")) {
+            lastLocation = DataLocation.deserializeText(dataObject.get("lastLocation").getAsString());
+        }
+
+        LinkedHashMap<String, DataLocation> homeData = new LinkedHashMap<>();
+        if (dataObject.has("homes")) {
+            JsonObject homesObject = dataObject.getAsJsonObject("homes");
+            if (homesObject != null) {
+                homesObject.entrySet().forEach(entry -> {
+                    DataLocation location = DataLocation.deserializeText(entry.getValue().getAsString());
+                    if (location != null) homeData.put(entry.getKey(), location);
+                });
+            }
+        }
+
+        return new UserData(uuid, lastLocation, homeData);
+    }
+
+    @Override
+    public void saveUserData(@NotNull UserData data) throws Exception {
+        JsonObject dataObject = new JsonObject();
+        if (data.getLastLocation() != null) {
+            dataObject.addProperty("lastLocation", DataSerializer.serializeLocation(data.getLastLocation()));
+        }
+        dataObject.add("homes", GSON.toJsonTree(DataSerializer.serializeLocationsMap(data.getHomeLocations())));
+
+        FileWriter writer = new FileWriter(new File(getDataFolder(), data.getUserUUID() + ".json"));
+        writer.write(GSON.toJson(dataObject));
+        writer.flush();
+        writer.close();
+    }
+
+    private @NotNull Map<String, WarpInfo> loadWarps() throws Exception {
+        File warpDataFile = new File(getDataFolder(), "warps.json");
+        if (!warpDataFile.exists()) return new LinkedHashMap<>();
+
+        JsonElement dataElement = PARSER.parse(new FileReader(warpDataFile));
+        if (!dataElement.isJsonObject()) throw new NullPointerException(warpDataFile.getName());
+
+        JsonObject dataObject = dataElement.getAsJsonObject();
+        LinkedHashMap<String, WarpInfo> warps = new LinkedHashMap<>();
+        dataObject.entrySet().forEach(entry -> {
+            String warpName = entry.getKey();
+            if (entry.getValue().isJsonObject()) {
+                try {
+                    JsonObject warpObject = entry.getValue().getAsJsonObject();
+                    UUID owner = warpObject.has("owner") ? UUIDUtil.toUUID(warpObject.get("owner").getAsString()) : null;
+                    DataLocation location = new DataLocation(
+                            warpObject.get("world").getAsString(),
+                            warpObject.get("x").getAsDouble(),
+                            warpObject.get("y").getAsDouble(),
+                            warpObject.get("z").getAsDouble(),
+                            warpObject.get("yaw").getAsFloat(),
+                            warpObject.get("pitch").getAsFloat()
+                    );
+                    warps.put(warpName, new WarpInfo(warpName, owner, location));
+                } catch (Exception ignore) {
+                }
+            }
+        });
+        return warps;
+    }
+
+    @Override
+    public void saveWarps(@NotNull Map<String, WarpInfo> warps) throws Exception {
+        JsonObject dataObject = new JsonObject();
+
+        warps.forEach((name, info) -> dataObject.add(name, GSON.toJsonTree(DataSerializer.serializeWarpMap(info))));
+
+        FileWriter writer = new FileWriter(new File(getDataFolder(), "warps.json"));
+        writer.write(GSON.toJson(dataObject));
+        writer.flush();
+        writer.close();
+    }
+
+    @Override
+    public Map<String, WarpInfo> getWarps() {
+        return warpsMap;
+    }
+
+    @Override
+    public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) {
+        this.warpsMap.put(name, warpInfo);
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) {
+        return this.warpsMap.remove(name) != null;
+    }
+
+
+}

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

@@ -0,0 +1,141 @@
+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.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataSerializer;
+import cc.carm.plugin.moeteleport.storage.impl.FileBasedStorage;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+public class YAMLStorage extends FileBasedStorage {
+
+    Map<String, WarpInfo> warpsMap;
+
+    File warpsDataFile;
+    FileConfiguration warpsConfiguration;
+
+    @Override
+    public boolean initialize() {
+        if (super.initialize()) {
+            try {
+                this.warpsDataFile = new File(getDataFolder(), "warps.yml");
+                if (!this.warpsDataFile.exists()) {
+                    boolean success = warpsDataFile.createNewFile();
+                }
+                this.warpsConfiguration = YamlConfiguration.loadConfiguration(warpsDataFile);
+                this.warpsMap = loadWarps();
+                return true;
+            } catch (Exception e) {
+                Main.serve("无法加载地标数据，请检查文件权限和相关配置。");
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void saveWarps(@NotNull Map<String, WarpInfo> warps) throws Exception {
+        this.warpsConfiguration.save(this.warpsDataFile);
+    }
+
+    @Override
+    public @Nullable UserData loadData(@NotNull UUID uuid) {
+        if (getDataFolder() == null || !getDataFolder().exists() || !getDataFolder().isDirectory()) {
+            throw new NullPointerException("Storage data folder is not initialized.");
+        }
+        File userDataFile = new File(getDataFolder(), uuid + ".yml");
+        if (!userDataFile.exists()) {
+            Main.debugging("当前文件夾内不存在玩家 " + uuid + " 的数据，视作新档。");
+            return null;
+        }
+
+        YamlConfiguration userConfiguration = YamlConfiguration.loadConfiguration(userDataFile);
+
+        DataLocation lastLocation = Optional
+                .ofNullable(userConfiguration.getString("lastLocation"))
+                .map(DataLocation::deserializeText)
+                .orElse(null);
+
+        LinkedHashMap<String, DataLocation> homeData = new LinkedHashMap<>();
+        Optional.ofNullable(userConfiguration.getConfigurationSection("homes")).ifPresent(
+                section -> section.getKeys(false).forEach(homeName -> {
+                    DataLocation location = DataLocation.deserializeText(section.getString(homeName));
+                    if (location != null) homeData.put(homeName, location);
+                }));
+
+        return new UserData(uuid, lastLocation, homeData);
+    }
+
+    @Override
+    public void saveUserData(@NotNull UserData data) throws Exception {
+        if (getDataFolder() == null || !getDataFolder().exists() || !getDataFolder().isDirectory()) {
+            throw new NullPointerException("Storage data folder is not initialized.");
+        }
+
+        YamlConfiguration userConfiguration = new YamlConfiguration();
+        if (data.getLastLocation() != null) {
+            userConfiguration.set("lastLocation", DataSerializer.serializeLocation(data.getLastLocation()));
+        }
+
+        userConfiguration.createSection("homes", DataSerializer.serializeLocationsMap(data.getHomeLocations()));
+        userConfiguration.save(new File(getDataFolder(), data.getUserUUID() + ".yml"));
+    }
+
+    private @NotNull Map<String, WarpInfo> loadWarps() {
+        LinkedHashMap<String, WarpInfo> warps = new LinkedHashMap<>();
+
+        ConfigurationSection warpsSection = this.warpsConfiguration.getConfigurationSection("warps");
+        if (warpsSection == null) return warps;
+
+        for (String warpName : warpsSection.getKeys(false)) {
+            ConfigurationSection warpInfoSection = warpsSection.getConfigurationSection(warpName);
+            if (warpInfoSection == null) continue;
+            try {
+                String ownerString = warpInfoSection.getString("owner");
+                UUID owner = ownerString == null ? null : UUID.fromString(ownerString);
+                DataLocation location = new DataLocation(
+                        warpInfoSection.getString("world"),
+                        warpInfoSection.getDouble("x"),
+                        warpInfoSection.getDouble("y"),
+                        warpInfoSection.getDouble("z"),
+                        warpInfoSection.getLong("yaw"),
+                        warpInfoSection.getLong("pitch")
+                );
+                warps.put(warpName, new WarpInfo(warpName, owner, location));
+            } catch (Exception ignore) {
+            }
+        }
+
+        return warps;
+    }
+
+    @Override
+    public Map<String, WarpInfo> getWarps() {
+        return warpsMap;
+    }
+
+    @Override
+    public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) {
+        this.warpsMap.put(name, warpInfo);
+        this.warpsConfiguration.createSection("warps." + name, DataSerializer.serializeWarpMap(warpInfo));
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) {
+        this.warpsConfiguration.set("warps." + name, null);
+        return this.warpsMap.remove(name) != null;
+    }
+
+
+}

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

@@ -0,0 +1,68 @@
+package cc.carm.plugin.moeteleport.storage.impl;
+
+import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
+import cc.carm.plugin.moeteleport.Main;
+import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataStorage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.UUID;
+
+public abstract class FileBasedStorage implements DataStorage {
+
+    private static final ConfigValue<String> FILE_PATH = new ConfigValue<>(
+            "storage.file-path", String.class, "data"
+    );
+
+    protected @Nullable File dataFolder;
+
+    @Override
+    public boolean initialize() {
+        try {
+            this.dataFolder = new File(Main.getInstance().getDataFolder(), FILE_PATH.get());
+            if (!dataFolder.exists()) {
+                return dataFolder.mkdir();
+            } else {
+                return dataFolder.isDirectory();
+            }
+        } catch (Exception ex) {
+            return false;
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        // 似乎没什么需要做的？
+        dataFolder = null;
+    }
+
+    @Override
+    public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) throws Exception {
+        // saveData 方法即保存所有数据，不需要针对单个数据进行变更。
+    }
+
+    @Override
+    public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) {
+        // saveData 方法即保存所有数据，不需要针对单个数据进行变更。
+        return true;
+    }
+
+    @Override
+    public void setWarp(@NotNull String name, @NotNull WarpInfo warpInfo) {
+        // saveWarp 方法即保存所有数据，不需要针对单个数据进行变更。
+    }
+
+    @Override
+    public boolean delWarp(@NotNull String name) {
+        // saveWarp 方法即保存所有数据，不需要针对单个数据进行变更。
+        return true;
+    }
+
+    public @Nullable File getDataFolder() {
+        return dataFolder;
+    }
+
+}

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

@@ -0,0 +1,57 @@
+package cc.carm.plugin.moeteleport.storage.impl;
+
+import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
+import cc.carm.plugin.moeteleport.model.UserData;
+import cc.carm.plugin.moeteleport.model.WarpInfo;
+import cc.carm.plugin.moeteleport.storage.DataStorage;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.UUID;
+
+public abstract class PluginBasedStorage implements DataStorage {
+
+    protected Plugin dependPlugin;
+
+    public PluginBasedStorage(String dependPluginName) {
+        this.dependPlugin = Bukkit.getPluginManager().getPlugin(dependPluginName);
+    }
+
+    @Override
+    public boolean initialize() {
+        return dependPlugin != null;
+    }
+
+    public Plugin getDependPlugin() {
+        return dependPlugin;
+    }
+
+    @Override
+    public void shutdown() {
+        // 一般啥也不需要我们做
+    }
+
+    @Override
+    public void saveUserData(@NotNull UserData data) {
+        // 一般都由其他插件自行保存，不需要实现。
+    }
+
+    @Override
+    public void saveWarps(@NotNull Map<String, WarpInfo> warps) {
+        // 一般都由其他插件自行保存，不需要实现。
+    }
+
+    @Override
+    public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) {
+        // 一般都由其他插件自行保存，不需要实现。
+    }
+
+    @Override
+    public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) {
+        // 一般都由其他插件自行保存，不需要实现。
+        return true;
+    }
+
+}

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

@@ -0,0 +1,8 @@
+package cc.carm.plugin.moeteleport.util;
+
+import cc.carm.plugin.moeteleport.storage.DataStorage;
+
+@FunctionalInterface
+public interface DataTaskRunner {
+    void run(DataStorage storage) throws Exception;
+}

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

@@ -0,0 +1,105 @@
+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/UpdateChecker.java

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,6 @@
+&d _____        &5 _____     _                 _
+&d|     |___ ___&5|_   _|___| |___ ___ ___ ___| |_
+&d| | | | . | -_|&5 | | | -_| | -_| . | . |  _|  _|
+&d|_|_|_|___|___|&5 |_| |___|_|___|  _|___|_| |_|
+&d               &5               |_|
+&f 查看更多信息请访问项目主页&d https://github.com/CarmJos/MoeTeleport

src/main/resources/config.yml

@@ -1,11 +1,60 @@
+# ${project.name} - ${project.description}
+# 项目地址: ${project.url}
+# 下载地址: ${project.distributionManagement.downloadUrl}
 version: ${project.version}
+debug: false
 
-defaultHome: 1
+# 统计数据设定
+# 该选项用于帮助开发者统计插件版本与使用情况，且绝不会影响性能与使用体验。
+# 当然，您也可以选择在这里关闭，或在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:
-  # 以下命令全部为 MoeTeleport 的子节点
+  home:
-  # 如 "home.vip" 的权限全拼就是 "MoeTeleport.home.vip"
+    10: "MoeTeleport.home.vip" # 拥有该权限的玩家最多可以设置10个家
-  10: "home.vip" # 最多可以设置10个家
+  warp:
+    2: "MoeTeleport.home.vip" # 拥有该权限的玩家最多可以设置2个地标
 
 # 传送请求过期时间
 expireTime: 30

src/main/resources/messages.yml

@@ -1,68 +1,4 @@
-no-last-location:
+# ${project.name} - ${project.description}
-  - "&f您当前没有进行传送，无法返回上个地点。"
+# 项目地址: ${project.url}
-
+# 下载地址: ${project.distributionManagement.downloadUrl}
-death-back:
+version: ${project.version}
-  - "&f您可以输入 &5/back &f返回您的死亡地点。"
-
-not-online:
-  - "&f目标玩家并不在线，无法发送请求。"
-tpa:
-  - "&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拒绝该请求。"
-tpahere:
-  - "&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拒绝该请求。"
-tpaccept:
-  - "&f您同意了 &d%(player) &f的传送请求。"
-tpdeny:
-  - "&f您&d拒绝&f了 &d%(player) &f的传送请求。"
-accepted:
-  - "&d%(player) &f同意了您的传送请求。"
-denied:
-  - "&d%(player) &f拒绝了您的传送请求。"
-
-
-
-offline:
-  - "&d%(player) &f离线，相关请求已自动取消。"
-
-request-duplicate:
-  - "&f您已经向 &d%(player) &f发送过传送请求，对方仍有 &5%(expire)秒 &f的时间回应该请求。"
-request-sent:
-  - "&f成功向玩家 &d%(player) &f发送传送请求，对方有 &5%(expire)秒 &f的时间回应该请求。"
-no-request:
-  - "&f您当前没有任何待处理的传送请求。"
-no-request-player:
-  - "&f您当前没有收到来自 &d%(player) &f的传送请求。"
-multi-requests:
-  - "&f您当前有&d%(num)条请求&f待处理，请输入 &5/%(command) <玩家名> &f决定回应谁的请求。"
-  - "&f您也可以再次输入 &5/%(command) &f快速回应最近的一条请求。"
-request-sent-timeout:
-  - "&f发往 &d%(player) &f的传送请求已超时。"
-request-received-timeout:
-  - "&f来自 &d%(player) &f的传送请求已超时。"
-teleporting:
-  - "&f正在传送到 &d%(location) &f..."
-dangerous:
-  - "&f目标地点不安全，传送被取消。"
-dangerous-here:
-  - "&f当前地点不安全，传送被取消。"
-notAvailable:
-  - "&f目标地点暂时无法前往，传送被取消。"
-
-home-list-header:
-  - "&f您当前设定的所有家："
-home-list-object: "&8# &f%(id) &d%(location) [&7✈](show_text=点击返回家 %(id) run_command=/home %(id))"
-home-not-found:
-  - "&f您还没有设置这个家，请先输入 &5/setHome <家名称> &f设置一个吧！"
-home-set:
-  - "&f成功设定名为 &d%(name) &f的家传送点。"
-home-removed:
-  - "&f成功移除名为 &d%(name) &f的家传送点。"
-  - "&7原先位置为 &f%(location) &7。"
-home-over-limit:
-  - "&f您最多只能设置 &d%(max) &f个家传送点！"
-  - "&7可以输入 &5/delHome <家名称> &7删除之前的家传送点，"
-  - "&7或输入 &5/setHome <家名称> &7覆盖之前的家传送点。"

src/main/resources/plugin.yml

@@ -1,12 +1,15 @@
 main: cc.carm.plugin.moeteleport.Main
-name: ${project.name}
+name: MoeTeleport
 version: ${project.version}
 author: CarmJos
 website: ${project.url}
 description: ${project.description}
 
+api-version: 1.13
+
 softdepend:
   - PlaceholderAPI
+  - Essentials
 
 permissions:
   "MoeTeleport":
@@ -50,3 +53,21 @@ commands:
   "delHome":
     usage: "/delHome <名称> "
     description: "删除家的传送点。"
+
+  "warp":
+    usage: "/warp [名称] "
+    description: "返回地标点所在位置。"
+  "warpInfo":
+    usage: "/warpInfo <名称> "
+    description: "查看地标点相关信息。"
+  "listWarps":
+    aliases:
+      - warps
+    usage: “/listWarps [页码]”
+    description: "列出服务器中所有地标点位置。"
+  "setWarp":
+    usage: "/setWarp [名称] "
+    description: "设置地标传送点 (不填名称默认为自己的游戏ID)"
+  "delWarp":
+    usage: "/delWarp <名称> "
+    description: "删除一个地标传送点。"