From 615458adab362a507a9d91d00991cf40e2ec01aa Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:09:23 +0100 Subject: [PATCH] Update permissions to mention the plugin they're from --- .../java/com/alttd/chat/config/Config.java | 2 +- .../main/java/com/alttd/chat/ChatPlugin.java | 2 +- galaxy/src/main/resources/plugin.yml | 20 +++++++++---------- .../commands/GlobalAdminChat.java | 2 +- .../alttd/velocitychat/commands/Reload.java | 2 +- .../alttd/velocitychat/commands/SendMail.java | 6 +++--- .../velocitychat/handlers/ChatHandler.java | 4 ++-- .../velocitychat/listeners/ChatListener.java | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java index 77396ff..ca1e55a 100755 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -271,7 +271,7 @@ public final class Config { } } - public static String SERVERMUTEPERMISSION = "command.mute-server"; + public static String SERVERMUTEPERMISSION = "chat.command.mute-server"; public static String SPYPERMISSION = "chat.socialspy"; private static void permissions() { SERVERMUTEPERMISSION = getString("permissions.server-mute", SERVERMUTEPERMISSION); diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java index 89c048d..ae47922 100755 --- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java +++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java @@ -111,7 +111,7 @@ public class ChatPlugin extends JavaPlugin { chatAPI.ReloadConfig(); chatAPI.ReloadChatFilters(); serverConfig = new ServerConfig(Bukkit.getServerName()); - Bukkit.broadcast("Reloaded ChatPlugin Config.", "command.proxy.reloadchat"); + Bukkit.broadcast("Reloaded ChatPlugin Config.", "command.chat.reloadchat"); ALogger.info("Reloaded ChatPlugin config."); } } diff --git a/galaxy/src/main/resources/plugin.yml b/galaxy/src/main/resources/plugin.yml index 73145b6..7c89ce4 100755 --- a/galaxy/src/main/resources/plugin.yml +++ b/galaxy/src/main/resources/plugin.yml @@ -6,28 +6,28 @@ authors: [Destro, Teriuihi] depend: [LuckPerms] commands: globalchat: - permission: command.globalchat + permission: command.chat.globalchat permission-message: You do not have permission! aliases: gc toggleglobalchat: - permission: command.globalchat + permission: command.chat.globalchat permission-message: You do not have permission! aliases: togglegc message: - permission: command.message + permission: command.chat.message aliases: [msg, tell] reply: - permission: command.message + permission: command.chat.message aliases: r ignore: - permission: command.ignore + permission: command.chat.ignore unignore: - permission: command.ignore + permission: command.chat.ignore muteserver: - permission: command.mute-server + permission: command.chat.mute-server spy: - permission: command.togglespy + permission: command.chat.togglespy chatparty: - permission: command.chatparty + permission: command.chat.chatparty pc: - permission: command.pc \ No newline at end of file + permission: command.chat.pc \ No newline at end of file diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java b/velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java index c865cc2..b99f1ad 100755 --- a/velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java @@ -16,7 +16,7 @@ public class GlobalAdminChat { public GlobalAdminChat(ProxyServer proxyServer) { LiteralCommandNode command = LiteralArgumentBuilder .literal("globaladminchat") - .requires(ctx -> ctx.hasPermission("command.proxy.globaladminchat")) + .requires(ctx -> ctx.hasPermission("command.chat.globaladminchat")) .then(RequiredArgumentBuilder .argument("message", StringArgumentType.greedyString()) .executes(context -> { diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java b/velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java index 930ac07..1a73766 100755 --- a/velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java @@ -13,7 +13,7 @@ public class Reload { public Reload(ProxyServer proxyServer) { LiteralCommandNode command = LiteralArgumentBuilder .literal("reloadchat") - .requires(ctx -> ctx.hasPermission("command.proxy.reloadchat")) + .requires(ctx -> ctx.hasPermission("command.chat.reloadchat")) .executes(context -> { VelocityChat.getPlugin().ReloadConfig(); return 1; diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java b/velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java index 551e677..0310363 100755 --- a/velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java @@ -42,7 +42,7 @@ public class SendMail { LiteralCommandNode command = LiteralArgumentBuilder .literal("mail") - .requires(ctx -> ctx.hasPermission("command.proxy.mail")) + .requires(ctx -> ctx.hasPermission("command.chat.mail")) .then(LiteralArgumentBuilder.literal("send") .then(playerNode .then(RequiredArgumentBuilder @@ -63,7 +63,7 @@ public class SendMail { }) ) .then(LiteralArgumentBuilder.literal("list") - .requires(ctx -> ctx.hasPermission("command.proxy.list"))// TODO permission + .requires(ctx -> ctx.hasPermission("command.chat.mail.list"))// TODO permission .then(LiteralArgumentBuilder.literal("unread") .executes(context -> { VelocityChat.getPlugin().getChatHandler().readMail(context.getSource(), true); @@ -96,7 +96,7 @@ public class SendMail { ) ) .then(LiteralArgumentBuilder.literal("admin") - .requires(ctx -> ctx.hasPermission("command.proxy.mail.admin"))// TODO permission + .requires(ctx -> ctx.hasPermission("command.chat.mail.admin"))// TODO permission // TODO admin command, remove, edit? .executes(context -> { sendAdminHelpMessage(context.getSource()); diff --git a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java index b1d750b..58031e8 100755 --- a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java +++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java @@ -85,7 +85,7 @@ public class ChatHandler { public void globalAdminChat(String message) { Component component = GsonComponentSerializer.gson().deserialize(message); - VelocityChat.getPlugin().getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.proxy.globaladminchat")/*TODO permission*/).forEach(target -> { + VelocityChat.getPlugin().getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.chat.globaladminchat")/*TODO permission*/).forEach(target -> { target.sendMessage(component); }); } @@ -108,7 +108,7 @@ public class ChatHandler { Component component = Utility.parseMiniMessage(Config.GACFORMAT, templates); - VelocityChat.getPlugin().getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.proxy.globaladminchat")/*TODO permission*/).forEach(target -> { + VelocityChat.getPlugin().getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.chat.globaladminchat")/*TODO permission*/).forEach(target -> { target.sendMessage(component); }); } diff --git a/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java index c617bd0..10fc9d8 100755 --- a/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java +++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java @@ -44,7 +44,7 @@ public class ChatListener { Component message = Utility.parseMiniMessage(Config.GACFORMAT, templates); - plugin.getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.proxy.globaladminchat")).forEach(target -> { + plugin.getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.chat.globaladminchat")).forEach(target -> { target.sendMessage(message); }); }