From 14f15aa7540aab54166d1e2817d3a56324de7733 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Sat, 17 Jul 2021 17:41:44 +0200 Subject: [PATCH] cleanup&fixup --- .../bukkit/command/MainCommandExecutor.java | 1 - .../common/commands/CWCommand.java | 4 ++-- CommandWhitelistVelocity/pom.xml | 2 +- .../velocity/CommandWhitelistVelocity.java | 7 ++++--- .../velocity/command/VelocityMainCommand.java | 15 ++++++--------- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java index 768849d..75d4465 100644 --- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java +++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java @@ -26,7 +26,6 @@ public class MainCommandExecutor implements TabExecutor { audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission()))); return true; } - try { CWCommand.CommandType commandType = CWCommand.CommandType.valueOf(args[0].toUpperCase()); switch (commandType) { diff --git a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java index 70a1e40..2e8fed1 100644 --- a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java +++ b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java @@ -16,8 +16,7 @@ public class CWCommand { public static boolean addToWhitelist(ConfigCache configCache, String command, String group) { CWGroup cwGroup = configCache.getGroupList().get(group); - if (cwGroup == null) - return false; + if (cwGroup == null) return false; cwGroup.addCommand(command); configCache.saveCWGroup(group, cwGroup); return true; @@ -57,6 +56,7 @@ public class CWCommand { public static List commandSuggestions(ConfigCache config, Collection serverCommands, String[] args, boolean reloadPerm, boolean adminPerm) { List list = new ArrayList<>(); switch (args.length) { + case 0: case 1: if ("reload".startsWith(args[0]) && reloadPerm) list.add("reload"); diff --git a/CommandWhitelistVelocity/pom.xml b/CommandWhitelistVelocity/pom.xml index 4266354..a81a411 100644 --- a/CommandWhitelistVelocity/pom.xml +++ b/CommandWhitelistVelocity/pom.xml @@ -82,7 +82,7 @@ com.velocitypowered velocity-api - 1.1.0 + 3.0.0 provided diff --git a/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/CommandWhitelistVelocity.java b/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/CommandWhitelistVelocity.java index 5679e29..cdfb8dc 100644 --- a/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/CommandWhitelistVelocity.java +++ b/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/CommandWhitelistVelocity.java @@ -105,10 +105,11 @@ public class CommandWhitelistVelocity { HashMap groups = configCache.getGroupList(); HashSet commandList = new HashSet<>(); for (Map.Entry s : groups.entrySet()) { + CWGroup group = s.getValue(); if (s.getKey().equalsIgnoreCase("default")) - commandList.addAll(s.getValue().getCommands()); - else if (player.hasPermission(s.getValue().getPermission())) - commandList.addAll(s.getValue().getCommands()); + commandList.addAll(group.getCommands()); + else if (player.hasPermission(group.getPermission())) + commandList.addAll(group.getCommands()); } return commandList; } diff --git a/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/command/VelocityMainCommand.java b/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/command/VelocityMainCommand.java index f4baab9..f8dd98b 100644 --- a/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/command/VelocityMainCommand.java +++ b/CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/command/VelocityMainCommand.java @@ -42,11 +42,11 @@ public class VelocityMainCommand implements SimpleCommand { } if (args.length == 3) { if (CWCommand.addToWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1])) - sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().added_to_whitelist)); + sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().added_to_whitelist, args[2], args[1]))); else - sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist)); + sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1]))); } else - sender.sendMessage(Component.text("/"+label+" add ")); + sender.sendMessage(Component.text("/" + label + " add ")); return; case REMOVE: if (!sender.hasPermission(CWPermission.ADMIN.permission())) { @@ -55,11 +55,11 @@ public class VelocityMainCommand implements SimpleCommand { } if (args.length == 3) { if (CWCommand.removeFromWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1])) - sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().removed_from_whitelist)); + sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().removed_from_whitelist, args[2], args[1]))); else - sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist)); + sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1]))); } else - sender.sendMessage(Component.text("/"+label+" remove ")); + sender.sendMessage(Component.text("/" + label + " remove ")); return; case HELP: default: @@ -78,9 +78,6 @@ public class VelocityMainCommand implements SimpleCommand { String[] args = invocation.arguments(); return CompletableFuture.supplyAsync(() -> { List serverCommands = new ArrayList<>(); - //TODO find out how to get all registered commands - - // This is probably very broken now return CWCommand.commandSuggestions(CommandWhitelistVelocity.getConfigCache(), serverCommands, args, source.hasPermission(CWPermission.RELOAD.permission()), source.hasPermission(CWPermission.ADMIN.permission())); }); }