From 37b773c6c35ee4b052a146459961d94ec41f22cb Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Thu, 8 Aug 2024 23:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewarp=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lunadeer/essentialsd/EssentialsD.java  | 19 ++++++++++++
 .../essentialsd/commands/{ => time}/Day.java  |  2 +-
 .../commands/{ => time}/Night.java            |  2 +-
 .../essentialsd/commands/{ => time}/Noon.java |  2 +-
 .../essentialsd/commands/{ => tp}/Back.java   |  2 +-
 .../essentialsd/commands/{ => tp}/Rtp.java    |  2 +-
 .../essentialsd/commands/{ => tp}/Tpa.java    |  2 +-
 .../commands/{ => tp}/TpaHere.java            |  2 +-
 .../essentialsd/commands/warp/DelWarp.java    | 14 +++++++++
 .../essentialsd/commands/warp/SetWarp.java    | 14 +++++++++
 .../essentialsd/commands/warp/Warp.java       | 14 +++++++++
 .../essentialsd/commands/warp/Warps.java      | 14 +++++++++
 .../commands/{ => weather}/Rain.java          |  2 +-
 .../commands/{ => weather}/Storm.java         |  2 +-
 .../commands/{ => weather}/Sun.java           |  2 +-
 src/main/resources/plugin.yml                 | 29 ++++++++++++++++++-
 16 files changed, 113 insertions(+), 11 deletions(-)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => time}/Day.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => time}/Night.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => time}/Noon.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => tp}/Back.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => tp}/Rtp.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => tp}/Tpa.java (98%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => tp}/TpaHere.java (97%)
 create mode 100644 src/main/java/cn/lunadeer/essentialsd/commands/warp/DelWarp.java
 create mode 100644 src/main/java/cn/lunadeer/essentialsd/commands/warp/SetWarp.java
 create mode 100644 src/main/java/cn/lunadeer/essentialsd/commands/warp/Warp.java
 create mode 100644 src/main/java/cn/lunadeer/essentialsd/commands/warp/Warps.java
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => weather}/Rain.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => weather}/Storm.java (95%)
 rename src/main/java/cn/lunadeer/essentialsd/commands/{ => weather}/Sun.java (95%)

diff --git a/src/main/java/cn/lunadeer/essentialsd/EssentialsD.java b/src/main/java/cn/lunadeer/essentialsd/EssentialsD.java
index d515fdb..67ab696 100644
--- a/src/main/java/cn/lunadeer/essentialsd/EssentialsD.java
+++ b/src/main/java/cn/lunadeer/essentialsd/EssentialsD.java
@@ -5,6 +5,20 @@ import cn.lunadeer.essentialsd.commands.home.DelHome;
 import cn.lunadeer.essentialsd.commands.home.Home;
 import cn.lunadeer.essentialsd.commands.home.Homes;
 import cn.lunadeer.essentialsd.commands.home.SetHome;
+import cn.lunadeer.essentialsd.commands.time.Day;
+import cn.lunadeer.essentialsd.commands.time.Night;
+import cn.lunadeer.essentialsd.commands.time.Noon;
+import cn.lunadeer.essentialsd.commands.tp.Back;
+import cn.lunadeer.essentialsd.commands.tp.Rtp;
+import cn.lunadeer.essentialsd.commands.tp.Tpa;
+import cn.lunadeer.essentialsd.commands.tp.TpaHere;
+import cn.lunadeer.essentialsd.commands.warp.DelWarp;
+import cn.lunadeer.essentialsd.commands.warp.SetWarp;
+import cn.lunadeer.essentialsd.commands.warp.Warp;
+import cn.lunadeer.essentialsd.commands.warp.Warps;
+import cn.lunadeer.essentialsd.commands.weather.Rain;
+import cn.lunadeer.essentialsd.commands.weather.Storm;
+import cn.lunadeer.essentialsd.commands.weather.Sun;
 import cn.lunadeer.essentialsd.events.*;
 import cn.lunadeer.essentialsd.managers.ConfigManager;
 import cn.lunadeer.essentialsd.managers.DatabaseTables;
@@ -72,6 +86,11 @@ public final class EssentialsD extends JavaPlugin {
         Objects.requireNonNull(Bukkit.getPluginCommand("homes")).setExecutor(new Homes());
         Objects.requireNonNull(Bukkit.getPluginCommand("sethome")).setExecutor(new SetHome());
         Objects.requireNonNull(Bukkit.getPluginCommand("delhome")).setExecutor(new DelHome());
+        // warp
+        Objects.requireNonNull(Bukkit.getPluginCommand("setwarp")).setExecutor(new SetWarp());
+        Objects.requireNonNull(Bukkit.getPluginCommand("delwarp")).setExecutor(new DelWarp());
+        Objects.requireNonNull(Bukkit.getPluginCommand("warp")).setExecutor(new Warp());
+        Objects.requireNonNull(Bukkit.getPluginCommand("warps")).setExecutor(new Warps());
 
 
         if (config.getRecipesCrowbar()) {
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Day.java b/src/main/java/cn/lunadeer/essentialsd/commands/time/Day.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Day.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/time/Day.java
index 83cb807..e06029d 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Day.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/time/Day.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.time;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Night.java b/src/main/java/cn/lunadeer/essentialsd/commands/time/Night.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Night.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/time/Night.java
index fad435b..951b527 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Night.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/time/Night.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.time;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Noon.java b/src/main/java/cn/lunadeer/essentialsd/commands/time/Noon.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Noon.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/time/Noon.java
index 7656e55..98d97e1 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Noon.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/time/Noon.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.time;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Back.java b/src/main/java/cn/lunadeer/essentialsd/commands/tp/Back.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Back.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/tp/Back.java
index 14b61d3..7ad0853 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Back.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/tp/Back.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.tp;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Rtp.java b/src/main/java/cn/lunadeer/essentialsd/commands/tp/Rtp.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Rtp.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/tp/Rtp.java
index 56fe368..43bcfbe 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Rtp.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/tp/Rtp.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.tp;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Tpa.java b/src/main/java/cn/lunadeer/essentialsd/commands/tp/Tpa.java
similarity index 98%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Tpa.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/tp/Tpa.java
index e5e4aa4..aa76d57 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Tpa.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/tp/Tpa.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.tp;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/TpaHere.java b/src/main/java/cn/lunadeer/essentialsd/commands/tp/TpaHere.java
similarity index 97%
rename from src/main/java/cn/lunadeer/essentialsd/commands/TpaHere.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/tp/TpaHere.java
index 6be52a9..48a2df7 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/TpaHere.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/tp/TpaHere.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.tp;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/warp/DelWarp.java b/src/main/java/cn/lunadeer/essentialsd/commands/warp/DelWarp.java
new file mode 100644
index 0000000..6a792ac
--- /dev/null
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/warp/DelWarp.java
@@ -0,0 +1,14 @@
+package cn.lunadeer.essentialsd.commands.warp;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+public class DelWarp implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+        // todo
+        return false;
+    }
+}
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/warp/SetWarp.java b/src/main/java/cn/lunadeer/essentialsd/commands/warp/SetWarp.java
new file mode 100644
index 0000000..4aca849
--- /dev/null
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/warp/SetWarp.java
@@ -0,0 +1,14 @@
+package cn.lunadeer.essentialsd.commands.warp;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+public class SetWarp implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+        // todo
+        return false;
+    }
+}
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/warp/Warp.java b/src/main/java/cn/lunadeer/essentialsd/commands/warp/Warp.java
new file mode 100644
index 0000000..1dd8fe1
--- /dev/null
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/warp/Warp.java
@@ -0,0 +1,14 @@
+package cn.lunadeer.essentialsd.commands.warp;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+public class Warp implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+        // todo
+        return false;
+    }
+}
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/warp/Warps.java b/src/main/java/cn/lunadeer/essentialsd/commands/warp/Warps.java
new file mode 100644
index 0000000..969b6bd
--- /dev/null
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/warp/Warps.java
@@ -0,0 +1,14 @@
+package cn.lunadeer.essentialsd.commands.warp;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+public class Warps implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+        // todo
+        return false;
+    }
+}
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Rain.java b/src/main/java/cn/lunadeer/essentialsd/commands/weather/Rain.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Rain.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/weather/Rain.java
index da2850a..927b111 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Rain.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/weather/Rain.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.weather;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Storm.java b/src/main/java/cn/lunadeer/essentialsd/commands/weather/Storm.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Storm.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/weather/Storm.java
index 76109c7..ff1d49e 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Storm.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/weather/Storm.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.weather;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/java/cn/lunadeer/essentialsd/commands/Sun.java b/src/main/java/cn/lunadeer/essentialsd/commands/weather/Sun.java
similarity index 95%
rename from src/main/java/cn/lunadeer/essentialsd/commands/Sun.java
rename to src/main/java/cn/lunadeer/essentialsd/commands/weather/Sun.java
index 14a29a4..5ad6ad2 100644
--- a/src/main/java/cn/lunadeer/essentialsd/commands/Sun.java
+++ b/src/main/java/cn/lunadeer/essentialsd/commands/weather/Sun.java
@@ -1,4 +1,4 @@
-package cn.lunadeer.essentialsd.commands;
+package cn.lunadeer.essentialsd.commands.weather;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.minecraftpluginutils.Notification;
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7071e90..c537273 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -45,6 +45,13 @@ permissions:
     default: op
   essd.home:
     default: true
+  essd.setwarp:
+    default: op
+  essd.delwarp:
+    default: op
+  essd.warp:
+    default: true
+
 
 commands:
   suicide:
@@ -166,4 +173,24 @@ commands:
     description: 删除家
     usage: /delhome <名称>
     permission: essd.home
-    permission-message: 你没有权限使用home。
\ No newline at end of file
+    permission-message: 你没有权限使用home。
+  setwarp:
+    description: 设置传送点
+    usage: /setwarp <名称>
+    permission: essd.setwarp
+    permission-message: 你没有权限设置传送点。
+  delwarp:
+    description: 删除传送点
+    usage: /delwarp <名称>
+    permission: essd.delwarp
+    permission-message: 你没有权限删除传送点。
+  warp:
+    description: 传送到传送点
+    usage: /warp <名称>
+    permission: essd.warp
+    permission-message: 你没有权限传送到传送点。
+  warps:
+    description: 查看传送点列表
+    usage: /warps
+    permission: essd.warp
+    permission-message: 你没有权限查看传送点列表。