diff --git a/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java b/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java index 9ef0fdd..cff3ff7 100644 --- a/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java +++ b/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java @@ -11,7 +11,6 @@ import java.util.Map; public class CommandsList { public static List getCommands(Player player) { - List commandList = new ArrayList<>(); for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { @@ -22,7 +21,6 @@ public class CommandsList { } public static List getCommands(ProxiedPlayer player) { - List commandList = new ArrayList<>(); for (Map.Entry> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) { if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { @@ -32,4 +30,26 @@ public class CommandsList { return commandList; } + public static List getSuggestions(Player player) { + List suggestionList = new ArrayList<>(); + + for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermSubList().entrySet()) { + if (player.hasPermission("commandwhitelist.subcommands." + s.getKey())) + continue; + suggestionList.addAll(s.getValue()); + } + return suggestionList; + } + + public static String getLastArgument(String cmd) { + String[] parts = cmd.split(" "); + if (parts.length <= 1) + return ""; + String last = ""; + for (String part : parts) { + last = part; + } + return last; + } + } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java b/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java index 24e13c8..dd54f92 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java @@ -5,6 +5,7 @@ import eu.endermite.commandwhitelist.spigot.config.ConfigCache; import eu.endermite.commandwhitelist.spigot.listeners.LegacyPlayerTabChatCompleteListener; import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandPreProcessListener; import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandSendListener; +import eu.endermite.commandwhitelist.spigot.listeners.TabCompleteBlockerListener; import eu.endermite.commandwhitelist.spigot.metrics.BukkitMetrics; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -39,6 +40,8 @@ public class CommandWhitelist extends JavaPlugin { } } + getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this); + getCommand("commandwhitelist").setExecutor(new MainCommand()); getCommand("commandwhitelist").setTabCompleter(new MainCommand()); diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java b/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java index 7fdcbf9..256d59e 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java @@ -69,6 +69,7 @@ public class MainCommand implements TabExecutor { } if (sender.hasPermission("commandwhitelist.admin")) { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/cw add &b- Add command to group")); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/cw remove &b- Remove command from a group")); } } return true; diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java b/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java index 7473c4a..344bff9 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java @@ -13,20 +13,22 @@ public class ConfigCache { private FileConfiguration config; private HashMap> permList = new HashMap<>(); + private HashMap> permSubList = new HashMap<>(); private final String prefix, commandDenied, noPermission, noSubCommand, configReloaded, whitelistedCommand, - removedWhitelistedCommand, noSuchGroup; + removedWhitelistedCommand, noSuchGroup, subCommandDenied; private final List commandDeniedList; public ConfigCache(FileConfiguration config) { this.config = config; - prefix = config.getString("messages.prefix"); + prefix = config.getString("messages.prefix", ""); commandDenied = config.getString("messages.command-denied", null); commandDeniedList = config.getStringList("messages.command-denied"); - noPermission = config.getString("messages.no-permission"); - noSubCommand = config.getString("messages.no-such-subcommand"); - configReloaded = config.getString("messages.config-reloaded"); + subCommandDenied = config.getString("messages.subcommand-denied", "You cannot use this subcommand"); + noPermission = config.getString("messages.no-permission", "&cYou don't have permission to do this."); + noSubCommand = config.getString("messages.no-such-subcommand", "&cNo subcommand by that name."); + configReloaded = config.getString("messages.config-reloaded", "&eConfiguration reloaded."); whitelistedCommand = config.getString("messages.added-to-whitelist", "&eWhitelisted command &6%s &efor permission &6%s"); removedWhitelistedCommand = config.getString("messages.removed-from-whitelist", "&eRemoved command &6%s &efrom permission &6%s"); noSuchGroup = config.getString("messages.group-doesnt-exist", "&cGroup %s doesn't exist"); @@ -35,11 +37,19 @@ public class ConfigCache { for (String s : perms) { this.permList.put(s, config.getStringList("commands."+s)); } + + Set subperms = config.getConfigurationSection("tabcompletions").getKeys(false); + for (String s : subperms) { + this.permSubList.put(s, config.getStringList("tabcompletions."+s)); + } } public HashMap> getPermList() { return permList; } + public HashMap> getPermSubList() { + return permSubList; + } public boolean addCommand(String command, String group) { try { this.permList.get(group).add(command); @@ -83,4 +93,7 @@ public class ConfigCache { public String getNoSuchGroup() { return noSuchGroup; } + public String getSubCommandDenied() { + return subCommandDenied; + } } \ No newline at end of file diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java index 05a996f..c6f883c 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java @@ -25,7 +25,6 @@ public class LegacyPlayerTabChatCompleteListener { protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Server.TAB_COMPLETE) { @Override public void onPacketSending(PacketEvent event) { - try { Player player = event.getPlayer(); if (player.hasPermission("commandwhitelist.bypass")) { diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java index a4b1e8f..df6f3fd 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java @@ -1,5 +1,6 @@ package eu.endermite.commandwhitelist.spigot.listeners; +import eu.endermite.commandwhitelist.api.CommandsList; import eu.endermite.commandwhitelist.api.RandomStuff; import eu.endermite.commandwhitelist.spigot.CommandWhitelist; import eu.endermite.commandwhitelist.spigot.config.ConfigCache; @@ -17,28 +18,34 @@ public class PlayerCommandPreProcessListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) { Player player = event.getPlayer(); - if (player.hasPermission("commandwhitelist.bypass")) return; - String command = event.getMessage().toLowerCase(); - for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { if (!player.hasPermission("commandwhitelist.commands." + s.getKey())) continue; - for (String comm : s.getValue()) { comm = comm.toLowerCase(); - if (command.equalsIgnoreCase("/" + comm)) - return; - else if (command.startsWith("/" + comm + " ")) { + if (command.equalsIgnoreCase("/" + comm) || command.startsWith("/" + comm + " ")) { + String rawCmd = event.getMessage(); + List bannedSubCommands = CommandsList.getSuggestions(player); + for (String bannedSubCommand : bannedSubCommands) { + if (rawCmd.equalsIgnoreCase("/"+bannedSubCommand) || rawCmd.equalsIgnoreCase("/"+bannedSubCommand+" ")) { + event.setCancelled(true); + ConfigCache config = CommandWhitelist.getConfigCache(); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied()))); + return; + } + } return; } + + } } event.setCancelled(true); ConfigCache config = CommandWhitelist.getConfigCache(); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied()))); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied()))); } } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java new file mode 100644 index 0000000..9237405 --- /dev/null +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java @@ -0,0 +1,32 @@ +package eu.endermite.commandwhitelist.spigot.listeners; + +import eu.endermite.commandwhitelist.api.CommandsList; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import java.util.List; + +public class TabCompleteBlockerListener implements Listener { + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onCommandTabComplete(org.bukkit.event.server.TabCompleteEvent event) { + if (!(event.getSender() instanceof Player)) + return; + Player player = (Player) event.getSender(); + String buffer = event.getBuffer(); + String cmd = buffer.replace(CommandsList.getLastArgument(buffer), ""); + List blockedCommands = CommandsList.getSuggestions(player); + List suggestions = event.getCompletions(); + for (String s : blockedCommands) { + String slast = CommandsList.getLastArgument(s); + String scommand = s.replace(slast, ""); + cmd = cmd.replace(CommandsList.getLastArgument(cmd), ""); + if (cmd.startsWith("/"+scommand+" ")) { + continue; + } + suggestions.remove(slast); + } + event.setCompletions(suggestions); + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 4cc036f..d703535 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,6 +1,7 @@ messages: prefix: "CommandWhitelist > " command-denied: "No such command." + subcommand-denied: "You cannot use this subcommand" no-permission: "&cYou don't have permission to do this." no-such-subcommand: "&cNo subcommand by that name." config-reloaded: "&eConfiguration reloaded." @@ -30,4 +31,11 @@ commands: - warp # commandwhitelist.commands.example example: - - example \ No newline at end of file + - example + +tabcompletions: + # This one is working as a blacklist. Player will not be able + # to see/use listed subcommands unless they have specified permission + # commandwhitelist.subcommands.default + default: + - help about