From 2672768e13e4e36f29c49879636b151435a70e58 Mon Sep 17 00:00:00 2001 From: stevei5mc <2978383306@qq.com> Date: Thu, 4 Jan 2024 00:10:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=91=BD=E4=BB=A4=E7=9A=84=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=8B=A5=E6=9C=89=E6=9D=83=E9=99=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../npc/command/sub/AddRouteSubCommand.java | 2 +- .../npc/command/sub/CreateSubCommand.java | 2 +- .../npc/command/sub/DeleteSubCommand.java | 2 +- .../npc/command/sub/ReloadSubCommand.java | 2 +- src/main/resources/plugin.yml | 14 +++++++++++++- 5 files changed, 17 insertions(+), 5 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 index 99268e1..da519ef 100644 --- 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.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 index 679d951..24b37dc 100644 --- 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.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 index 22f7de8..a268276 100644 --- 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.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 index 39fa061..e6d3896 100644 --- 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.reload"); } @Override diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6e62e1c..fd085ed 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -12,4 +12,16 @@ softdepend: permissions: RsNPC.admin: default: op - description: "RsNPC插件主命令" \ No newline at end of file + description: "RsNPC插件主命令" + RsNPC.create: + default: op + description: "创建npc的命令" + RsNPC.delete: + default: op + description: "删除npc的命令" + RsNPC.reload: + default: op + description: "重载NPC配置文件的命令" + RsNPC.addroute: + default: op + description: "添加npc移动路径的命令" \ No newline at end of file From f23074b3bbe52536acabd8307cbd4bc44240b5a9 Mon Sep 17 00:00:00 2001 From: stevei5mc <2978383306@qq.com> Date: Thu, 4 Jan 2024 19:57:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=86=E6=9D=83=E9=99=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=BD=92=E5=B1=9E=E4=BA=8ERsNPC.admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smallaswater/npc/command/sub/AddRouteSubCommand.java | 2 +- .../smallaswater/npc/command/sub/CreateSubCommand.java | 2 +- .../smallaswater/npc/command/sub/DeleteSubCommand.java | 2 +- .../smallaswater/npc/command/sub/ReloadSubCommand.java | 2 +- src/main/resources/plugin.yml | 8 ++++---- 5 files changed, 8 insertions(+), 8 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 index da519ef..d4a1cc0 100644 --- 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.hasPermission("RsNPC.addroute"); + 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 index 24b37dc..b5ed46c 100644 --- 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.hasPermission("RsNPC.create"); + 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 index a268276..472916f 100644 --- 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.hasPermission("RsNPC.delete"); + 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 index e6d3896..bbf931c 100644 --- 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.hasPermission("RsNPC.reload"); + return sender.hasPermission("RsNPC.admin.reload"); } @Override diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index fd085ed..c8e9047 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -13,15 +13,15 @@ permissions: RsNPC.admin: default: op description: "RsNPC插件主命令" - RsNPC.create: + RsNPC.admin.create: default: op description: "创建npc的命令" - RsNPC.delete: + RsNPC.admin.delete: default: op description: "删除npc的命令" - RsNPC.reload: + RsNPC.admin.reload: default: op description: "重载NPC配置文件的命令" - RsNPC.addroute: + RsNPC.admin.addroute: default: op description: "添加npc移动路径的命令" \ No newline at end of file From aa5831cc32dad2d5f8399acde19193b3a1ae3d1e Mon Sep 17 00:00:00 2001 From: LT_Name <572413378@qq.com> Date: Sat, 6 Jan 2024 19:40:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?GUI=E9=83=A8=E5=88=86=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/smallaswater/npc/utils/FormHelper.java | 16 +++++++++++----- src/main/resources/plugin.yml | 10 +++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/smallaswater/npc/utils/FormHelper.java b/src/main/java/com/smallaswater/npc/utils/FormHelper.java index 18a94b0..e6bffd0 100644 --- 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 index e570bed..2faee8a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -12,16 +12,16 @@ softdepend: permissions: RsNPC.admin: default: op - description: "RsNPC插件主命令" + description: "RsNPC 插件主命令" RsNPC.admin.create: default: op - description: "创建npc的命令" + description: "RsNPC 创建NPC命令" RsNPC.admin.delete: default: op - description: "删除npc的命令" + description: "RsNPC 删除NPC命令" RsNPC.admin.reload: default: op - description: "重载NPC配置文件的命令" + description: "RsNPC 重载配置文件命令" RsNPC.admin.addroute: default: op - description: "添加npc移动路径的命令" \ No newline at end of file + description: "RsNPC 添加NPC移动路径命令" \ No newline at end of file