使用权限节点进行权限检查 (#39)

MemoriesOfTime · Jan 6, 2024 · 55ffafa · 55ffafa
1 parent cca79fd
commit 55ffafa
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/src/main/java/com/smallaswater/npc/command/sub/AddRouteSubCommand.java b/src/main/java/com/smallaswater/npc/command/sub/AddRouteSubCommand.java
@@ -21,7 +21,7 @@ public AddRouteSubCommand(String name) {
 
     @Override
     public boolean canUser(CommandSender sender) {
-        return sender.isPlayer() && sender.isOp();
+        return sender.isPlayer() && sender.hasPermission("RsNPC.admin.addroute");
     }
 
     @Override

diff --git a/src/main/java/com/smallaswater/npc/command/sub/CreateSubCommand.java b/src/main/java/com/smallaswater/npc/command/sub/CreateSubCommand.java
@@ -23,7 +23,7 @@ public CreateSubCommand(String name) {
 
     @Override
     public boolean canUser(CommandSender sender) {
-        return sender.isPlayer() && sender.isOp();
+        return sender.isPlayer() && sender.hasPermission("RsNPC.admin.create");
     }
 
     @Override

diff --git a/src/main/java/com/smallaswater/npc/command/sub/DeleteSubCommand.java b/src/main/java/com/smallaswater/npc/command/sub/DeleteSubCommand.java
@@ -18,7 +18,7 @@ public DeleteSubCommand(String name) {
 
     @Override
     public boolean canUser(CommandSender sender) {
-        return sender.isOp();
+        return sender.hasPermission("RsNPC.admin.delete");
     }
 
     @Override

diff --git a/src/main/java/com/smallaswater/npc/command/sub/ReloadSubCommand.java b/src/main/java/com/smallaswater/npc/command/sub/ReloadSubCommand.java
@@ -15,7 +15,7 @@ public ReloadSubCommand(String name) {
 
     @Override
     public boolean canUser(CommandSender sender) {
-        return sender.isOp();
+        return sender.hasPermission("RsNPC.admin.reload");
     }
 
     @Override

diff --git a/src/main/java/com/smallaswater/npc/utils/FormHelper.java b/src/main/java/com/smallaswater/npc/utils/FormHelper.java
@@ -38,11 +38,17 @@ public static void sendMain(@NotNull Player player) {
             simple.setContent(getRandomMessage() + "\n\n");
         }
 
-        simple.addButton(new ResponseElementButton(language.translateString("gui.main.button.createNPCText")).onClicked(FormHelper::sendCreateNpc));
-        simple.addButton(new ResponseElementButton(language.translateString("gui.main.button.adminNPCText")).onClicked(FormHelper::sendAdminNpcSelect));
-        simple.addButton(new ResponseElementButton(language.translateString("gui.main.button.reloadText"))
-                .onClicked(cp -> Server.getInstance().dispatchCommand(cp, "rsnpc reload"))
-        );
+        if (player.hasPermission("RsNPC.admin.create")) {
+            simple.addButton(new ResponseElementButton(language.translateString("gui.main.button.createNPCText")).onClicked(FormHelper::sendCreateNpc));
+            if (player.hasPermission("RsNPC.admin.delete")) {
+                simple.addButton(new ResponseElementButton(language.translateString("gui.main.button.adminNPCText")).onClicked(FormHelper::sendAdminNpcSelect));
+            }
+        }
+        if (player.hasPermission("RsNPC.admin.reload")) {
+            simple.addButton(new ResponseElementButton(language.translateString("gui.main.button.reloadText"))
+                    .onClicked(cp -> Server.getInstance().dispatchCommand(cp, "rsnpc reload"))
+            );
+        }
 
         player.showFormWindow(simple);
     }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -12,4 +12,16 @@ softdepend:
 permissions:
   RsNPC.admin:
     default: op
-    description: "RsNPC插件主命令"
+    description: "RsNPC 插件主命令"
+  RsNPC.admin.create:
+    default: op
+    description: "RsNPC 创建NPC命令"
+  RsNPC.admin.delete:
+    default: op
+    description: "RsNPC 删除NPC命令"
+  RsNPC.admin.reload:
+    default: op
+    description: "RsNPC 重载配置文件命令"
+  RsNPC.admin.addroute:
+    default: op
+    description: "RsNPC 添加NPC移动路径命令"