fix subcommand blocker

subcommandblocker broke when command included part of the subcommand, so for ex. /help he would remove "he" from the command and it would return as "/lp".

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: YouHaveTrouble
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: YouHaveTrouble
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: YouHaveTrouble
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/other-issue.md

@@ -0,0 +1,10 @@
+---
+name: Other issue
+about: For other issues
+title: ''
+labels: ''
+assignees: YouHaveTrouble
+
+---
+
+

.github/workflows/buildjar.yml

@@ -0,0 +1,36 @@
+name: Build CommandWhitelist Jar
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Git repo
+        uses: actions/checkout@v1
+      - name: Restore Maven cache
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: mvn package --file pom.xml
+      - name: Copy artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: CommandWhitelist
+          path: target/CommandWhitelist*.jar

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.3.2</version>
+    <version>1.7.8</version>
     <packaging>jar</packaging>
 
     <name>CommandWhitelist</name>
@@ -74,13 +74,17 @@
             <id>papermc</id>
             <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>velocity</id>
+            <url>https://repo.velocitypowered.com/snapshots/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.3-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -95,10 +99,16 @@
             <version>1.16-R0.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.5.0</version>
+            <version>4.6.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

readme.md

@@ -1,6 +1,9 @@
 Command  Whitelist is a plugin that allows you to control 
 precisely what commands players can see and use.
 
+<img src="https://img.shields.io/bstats/servers/8705?label=Spigot%20servers%20using%20CommandWhitelist&style=for-the-badge">
+<img src="https://img.shields.io/bstats/servers/8704?label=Proxy%20servers%20using%20CommandWhitelist&style=for-the-badge">
+
 <h3>Plugin Features</h3>
 
 <ul>
@@ -8,6 +11,7 @@ precisely what commands players can see and use.
 <li>Overwrites default "no such command" message with your branding
 <li>Blocks tab completion on spigot and bungeecord*</li>
 <li>Blocks command execution on spigot and bungeecord</li>
+<li>Blocks completion and execution of specific subcommands (spigot only)</li>
 </ul>
 
 \*This only works on Waterfall and its forks 

src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java

@@ -2,34 +2,72 @@ package eu.endermite.commandwhitelist.api;
 
 import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
 import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import org.bukkit.entity.Player;
+import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 public class CommandsList {
 
-    public static List<String> getCommands(Player player) {
-
+    public static List<String> getCommands(org.bukkit.entity.Player player) {
         List<String> commandList = new ArrayList<>();
         for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
-            if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                commandList.addAll(s.getValue());
+            else if (player.hasPermission("commandwhitelist.commands." + s.getKey()))
                     commandList.addAll(s.getValue());
-            }
         }
         return commandList;
     }
 
-    public static List<String> getCommands(ProxiedPlayer player) {
-
+    public static List<String> getCommands(net.md_5.bungee.api.connection.ProxiedPlayer player) {
         List<String> commandList = new ArrayList<>();
         for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
-            if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                commandList.addAll(s.getValue());
+            else if (player.hasPermission("commandwhitelist.commands." + s.getKey()))
                 commandList.addAll(s.getValue());
         }
+        return commandList;
+    }
+
+    public static List<String> getCommands(com.velocitypowered.api.proxy.Player player) {
+        List<String> commandList = new ArrayList<>();
+        for (Map.Entry<String, List<String>> s : CommandWhitelistVelocity.getConfigCache().getPermList().entrySet()) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                commandList.addAll(s.getValue());
+            else if (player.hasPermission("commandwhitelist.commands." + s.getKey()))
+                commandList.addAll(s.getValue());
         }
         return commandList;
     }
 
+    public static List<String> getSuggestions(org.bukkit.entity.Player player) {
+        List<String> suggestionList = new ArrayList<>();
+        for (Map.Entry<String, List<String>> 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;
+    }
+
+    public static String getCommandLabel(String cmd) {
+        String[] parts = cmd.split(" ");
+        if (parts[0].startsWith("/"))
+            parts[0] = parts[0].substring(1);
+        return parts[0];
+    }
+
 }

src/main/java/eu/endermite/commandwhitelist/api/RandomStuff.java

@@ -0,0 +1,26 @@
+package eu.endermite.commandwhitelist.api;
+
+import java.util.List;
+import java.util.Random;
+
+public class RandomStuff {
+
+    /**
+     *
+     * @param list List of strings to pick a random one from
+     * @param single String that will be used as fallback
+     * @return Randomized message
+     */
+
+    public static String getMessage(List<String> list, String single) {
+
+        if (list == null || list.size() == 0) {
+            return single;
+        }
+
+        Random random = new Random();
+        int r = random.nextInt(list.size());
+        return list.get(r);
+    }
+
+}

src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java

@@ -4,7 +4,7 @@ import com.google.common.io.ByteStreams;
 import eu.endermite.commandwhitelist.bungee.command.BungeeMainCommand;
 import eu.endermite.commandwhitelist.bungee.config.BungeeConfigCache;
 import eu.endermite.commandwhitelist.bungee.listeners.BungeeChatEventListener;
-import eu.endermite.commandwhitelist.bungee.listeners.BungeeTabCompleteListener;
+import eu.endermite.commandwhitelist.bungee.listeners.WaterfallDefineCommandsListener;
 import eu.endermite.commandwhitelist.bungee.metrics.BungeeMetrics;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
@@ -24,32 +24,30 @@ public final class CommandWhitelistBungee extends Plugin {
 
     @Override
     public void onEnable() {
-
         plugin = this;
         getLogger().info("Running on "+ ChatColor.DARK_AQUA+getProxy().getName());
         loadConfig();
         this.getProxy().getPluginManager().registerListener(this, new BungeeChatEventListener());
-        if (this.getProxy().getName().contains("Waterfall") || getProxy().getName().contains("FlameCord")) {
-            this.getProxy().getPluginManager().registerListener(this, new BungeeTabCompleteListener());
-        } else {
-            getLogger().info("Bungee tab completion requires Waterfall, FlameCord or other Waterfall fork.");
+        try {
+            Class.forName("io.github.waterfallmc.waterfall.conf.WaterfallConfiguration");
+            this.getProxy().getPluginManager().registerListener(this, new WaterfallDefineCommandsListener());
+        } catch (ClassNotFoundException e) {
+            getLogger().severe(ChatColor.DARK_RED+"Bungee tab completion blocker requires Waterfall other Waterfall fork.");
         }
-        getProxy().getPluginManager().registerCommand(this, new BungeeMainCommand());
+
+        getProxy().getPluginManager().registerCommand(this, new BungeeMainCommand("bcw"));
 
         int pluginId = 8704;
         new BungeeMetrics(this, pluginId);
-
     }
 
     public static CommandWhitelistBungee getPlugin() {
         return plugin;
     }
-
     public static BungeeConfigCache getConfigCache() {
         return configCache;
     }
 
-
     public void loadConfig() {
         try {
             if (!getDataFolder().exists()) {
@@ -77,8 +75,6 @@ public final class CommandWhitelistBungee extends Plugin {
         getProxy().getScheduler().runAsync(this, () -> {
             loadConfig();
             sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getConfigReloaded()));
-
         });
     }
-
 }

src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java

@@ -4,15 +4,17 @@ import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.TabExecutor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
+public class BungeeMainCommand extends Command implements TabExecutor {
 
-public class BungeeMainCommand extends Command {
-    public BungeeMainCommand() {
-        super("bungeecommandwhitelist", "none", "bcw");
-
+    public BungeeMainCommand(String name) {
+        super(name);
     }
 
-    @Override
     public void execute(CommandSender sender, String[] args) {
         if (args.length > 0) {
             if (args[0].equalsIgnoreCase("reload")) {
@@ -21,6 +23,41 @@ public class BungeeMainCommand extends Command {
                 } else {
                     sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoPermission()));
                 }
+            } else if (args[0].equalsIgnoreCase("add")) {
+                if (!sender.hasPermission("commandwhitelist.admin")) {
+                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoPermission()));
+                    return;
+                }
+                if (args.length >= 3) {
+                    if (CommandWhitelistBungee.getConfigCache().addCommand(args[2], args[1])) {
+                        String msg = String.format(CommandWhitelistBungee.getConfigCache().getWhitelistedCommand(), args[2], args[1]);
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    } else {
+                        String msg = CommandWhitelistBungee.getConfigCache().getNoSuchGroup();
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    }
+                } else {
+                    sender.sendMessage("/bcw add <group> <command>");
+                }
+                return;
+            } else if (args[0].equalsIgnoreCase("remove")) {
+
+                if (!sender.hasPermission("commandwhitelist.admin")) {
+                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoPermission()));
+                    return;
+                }
+                if (args.length >= 3) {
+                    if (CommandWhitelistBungee.getConfigCache().removeCommand(args[2], args[1])) {
+                        String msg = String.format(CommandWhitelistBungee.getConfigCache().getRemovedWhitelistedCommand(), args[2], args[1]);
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    } else {
+                        String msg = CommandWhitelistBungee.getConfigCache().getNoSuchGroup();
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    }
+                } else {
+                    sender.sendMessage("/bcw remove <group> <command>");
+                }
+
             } else {
                 sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoSubCommand()));
             }
@@ -31,4 +68,60 @@ public class BungeeMainCommand extends Command {
             }
         }
     }
+
+    @Override
+    public Iterable<String> onTabComplete(CommandSender sender, String[] args) {
+        List<String> list = new ArrayList<>();
+        if (args.length == 1) {
+            if ("reload".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) {
+                list.add("reload");
+            }
+            if ("add".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) {
+                list.add("add");
+            }
+            if ("remove".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) {
+                list.add("remove");
+            }
+        } else if (args.length == 2) {
+            if (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove")) {
+                if (!sender.hasPermission("commandwhitelist.admin"))
+                    return list;
+                for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
+                    if (s.getKey().startsWith(args[1])) {
+                        list.add(s.getKey());
+                    }
+                }
+            }
+        } else if (args.length == 3) {
+            if (args[0].equalsIgnoreCase("remove")) {
+                if (!sender.hasPermission("commandwhitelist.admin"))
+                    return list;
+                try {
+                    for (String s : CommandWhitelistBungee.getConfigCache().getPermList().get(args[1])) {
+                        if (s.startsWith(args[2])) {
+                            list.add(s);
+                        }
+                    }
+                } catch (NullPointerException ignored) {
+                }
+                return list;
+            }
+            if (args[0].equalsIgnoreCase("add")) {
+                if (!sender.hasPermission("commandwhitelist.admin"))
+                    return list;
+
+                for (Map.Entry<String, Command> command : CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()) {
+                    if (command.getKey().startsWith("/"))
+                        continue;
+
+                    if (CommandWhitelistBungee.getConfigCache().getPermList().get(args[1]).contains(command.getKey()))
+                        continue;
+
+                    if (command.getKey().startsWith(args[2]))
+                        list.add(command.getKey());
+                }
+            }
+        }
+        return list;
+    }
 }

src/main/java/eu/endermite/commandwhitelist/bungee/config/BungeeConfigCache.java

@@ -1,23 +1,35 @@
 package eu.endermite.commandwhitelist.bungee.config;
 
+import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
 import net.md_5.bungee.config.Configuration;
-
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+import java.io.File;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
 public class BungeeConfigCache {
 
-    private HashMap<String, List<String>> permList = new HashMap<>();
-    private String prefix, commandDenied, noPermission, noSubCommand, configReloaded;
+    private final Configuration config;
+    private final HashMap<String, List<String>> permList = new HashMap<>();
+    private final String prefix, commandDenied, noPermission, noSubCommand, configReloaded, whitelistedCommand,
+            removedWhitelistedCommand, noSuchGroup;
+    private List<String> commandDeniedList;
 
     public BungeeConfigCache(Configuration config) {
 
+        this.config = config;
+
         prefix = config.getString("messages.prefix");
-        commandDenied = config.getString("messages.command-denied");
+        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");
+        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");
 
         Collection<String> perms = config.getSection("commands").getKeys();
         for (String s : perms) {
@@ -28,11 +40,41 @@ public class BungeeConfigCache {
     public HashMap<String, List<String>> getPermList() {
         return permList;
     }
-
+    public boolean addCommand(String command, String group) {
+        try {
+            this.permList.get(group).add(command);
+            this.config.set("commands."+group, permList.get(group));
+            ConfigurationProvider.getProvider(YamlConfiguration.class).save(config, new File(CommandWhitelistBungee.getPlugin().getDataFolder(), "config.yml"));
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    public boolean removeCommand(String command, String group) {
+        try {
+            this.permList.get(group).remove(command);
+            this.config.set("commands."+group, permList.get(group));
+            ConfigurationProvider.getProvider(YamlConfiguration.class).save(config, new File(CommandWhitelistBungee.getPlugin().getDataFolder(), "config.yml"));
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
     public String getPrefix() {return prefix;}
     public String getCommandDenied() {return commandDenied;}
+    public List<String> getCommandDeniedList() {
+        return commandDeniedList;
+    }
     public String getNoPermission() {return noPermission;}
     public String getNoSubCommand() {return  noSubCommand;}
     public String getConfigReloaded() {return  configReloaded;}
-
+    public String getWhitelistedCommand() {
+        return whitelistedCommand;
+    }
+    public String getRemovedWhitelistedCommand() {
+        return removedWhitelistedCommand;
+    }
+    public String getNoSuchGroup() {
+        return noSuchGroup;
+    }
 }

src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java

@@ -1,6 +1,8 @@
 package eu.endermite.commandwhitelist.bungee.listeners;
 
+import eu.endermite.commandwhitelist.api.RandomStuff;
 import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
+import eu.endermite.commandwhitelist.bungee.config.BungeeConfigCache;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Listener;
@@ -12,28 +14,20 @@ public class BungeeChatEventListener implements Listener {
 
     @EventHandler
     public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) {
-
         if (event.isCancelled())
             return;
-
         if (!(event.getSender() instanceof ProxiedPlayer))
             return;
-
         if (!event.isProxyCommand())
             return;
-
         ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-
-        if (player.hasPermission("commandwhitelist.bypass")) {
+        if (player.hasPermission("commandwhitelist.bypass"))
             return;
-        }
-
         String command = event.getMessage().toLowerCase();
         boolean found = false;
         for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
             if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
                 continue;
-
             for (String comm : s.getValue()) {
                 comm = comm.toLowerCase();
                 if (command.equalsIgnoreCase("/" + comm)) {
@@ -47,7 +41,8 @@ public class BungeeChatEventListener implements Listener {
         }
         if (!found) {
             event.setCancelled(true);
-            player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied()));
+            BungeeConfigCache config = CommandWhitelistBungee.getConfigCache();
+            player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied())));
         }
     }
 }

src/main/java/eu/endermite/commandwhitelist/bungee/listeners/WaterfallDefineCommandsListener.java

@@ -9,29 +9,21 @@ import net.md_5.bungee.event.EventHandler;
 
 import java.util.HashMap;
 
-public class BungeeTabCompleteListener implements Listener {
+public class WaterfallDefineCommandsListener implements Listener {
 
     @EventHandler
     public void onProxyDefineCommandsEvent(io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event) {
-
         if (event.getReceiver() instanceof ProxiedPlayer) {
             ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
-
-            if (player.hasPermission("commandwhitelist.bypass")) {
+            if (player.hasPermission("commandwhitelist.bypass"))
                 return;
-            }
-
             HashMap<String, Command> commandHashMap = new HashMap<>();
             CommandsList.getCommands(player).forEach(cmdName ->
                     CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()
                             .stream()
                             .filter(commandEntry -> cmdName.equalsIgnoreCase(commandEntry.getValue().getName()))
                             .forEach(commandEntry -> commandHashMap.put(commandEntry.getKey(), commandEntry.getValue())));
-
             event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd));
         }
-
-
     }
-
 }

src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java

@@ -2,14 +2,13 @@ package eu.endermite.commandwhitelist.spigot;
 
 import eu.endermite.commandwhitelist.spigot.command.MainCommand;
 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.*;
 import eu.endermite.commandwhitelist.spigot.metrics.BukkitMetrics;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class CommandWhitelist extends JavaPlugin {
@@ -27,12 +26,21 @@ public class CommandWhitelist extends JavaPlugin {
 
         reloadPluginConfig();
 
+        Plugin protocollib = getServer().getPluginManager().getPlugin("ProtocolLib");
+
         getServer().getPluginManager().registerEvents(new PlayerCommandPreProcessListener(), this);
         if (!isLegacy) {
+            if (!getConfigCache().isUseProtocolLib() || protocollib == null || !protocollib.isEnabled()) {
+
                 getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
+            } else {
+                PacketCommandSendListener.protocol(this);
+                getLogger().info(ChatColor.AQUA+"Using ProtocolLib for command filter!");
+            }
+            getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
         } else {
             getLogger().info(ChatColor.AQUA+"Running in legacy mode...");
-            if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+            if (protocollib != null) {
                 LegacyPlayerTabChatCompleteListener.protocol(this);
             } else {
                 getLogger().info(ChatColor.YELLOW+"ProtocolLib is required for tab completion blocking!");
@@ -49,7 +57,7 @@ public class CommandWhitelist extends JavaPlugin {
     public void reloadPluginConfig() {
         saveDefaultConfig();
         reloadConfig();
-        configCache = new ConfigCache();
+        configCache = new ConfigCache(getConfig());
     }
 
     public void reloadPluginConfig(CommandSender sender) {
@@ -70,26 +78,18 @@ public class CommandWhitelist extends JavaPlugin {
 
     private boolean checkLegacy() {
 
-        String version = getServer().getVersion();
+        String version = Bukkit.getServer().getClass().getPackage().getName().replace("org.bukkit.craftbukkit", "").replace(".", "");
 
-        if (version.contains("1.8")) {
+        if (version.contains("v1_8_")) {
             return true;
-        } else if (version.contains("1.9")) {
+        } else if (version.contains("v1_9_")) {
             return true;
-        } else if (version.contains("1.10")) {
+        } else if (version.contains("v1_10_")) {
             return true;
-        } else if (version.contains("1.11")) {
+        } else if (version.contains("v1_11_")) {
             return true;
-        } else if (version.contains("1.12")) {
+        } else if (version.contains("v1_12_")) {
             return true;
-        } else if (version.contains("1.13")) {
-            return false;
-        } else if (version.contains("1.14")) {
-            return false;
-        } else if (version.contains("1.15")) {
-            return false;
-        } else if (version.contains("1.16")) {
-            return false;
         }
 
         return false;

src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java

@@ -5,8 +5,11 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.help.HelpTopic;
+
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class MainCommand implements TabExecutor {
 
@@ -14,10 +17,46 @@ public class MainCommand implements TabExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (args.length > 0) {
             if (args[0].equalsIgnoreCase("reload")) {
-                if (sender.hasPermission("commandwhitelist.reload")) {
-                    CommandWhitelist.getPlugin().reloadPluginConfig(sender);
-                } else {
+                if (!sender.hasPermission("commandwhitelist.reload")) {
                     sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoPermission()));
+                    return true;
+                }
+                CommandWhitelist.getPlugin().reloadPluginConfig(sender);
+
+            } else if (args[0].equalsIgnoreCase("add")) {
+
+                if (!sender.hasPermission("commandwhitelist.admin")) {
+                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoPermission()));
+                    return true;
+                }
+                if (args.length >= 3) {
+                    if (CommandWhitelist.getConfigCache().addCommand(args[2], args[1])) {
+                        String msg = String.format(CommandWhitelist.getConfigCache().getWhitelistedCommand(), args[2], args[1]);
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    } else {
+                        String msg = CommandWhitelist.getConfigCache().getNoSuchGroup();
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    }
+                } else {
+                    sender.sendMessage("/cw add <group> <command>");
+                }
+
+            } else if (args[0].equalsIgnoreCase("remove")) {
+
+                if (!sender.hasPermission("commandwhitelist.admin")) {
+                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoPermission()));
+                    return true;
+                }
+                if (args.length >= 3) {
+                    if (CommandWhitelist.getConfigCache().removeCommand(args[2], args[1])) {
+                        String msg = String.format(CommandWhitelist.getConfigCache().getRemovedWhitelistedCommand(), args[2], args[1]);
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    } else {
+                        String msg = CommandWhitelist.getConfigCache().getNoSuchGroup();
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', msg));
+                    }
+                } else {
+                    sender.sendMessage("/cw remove <group> <command>");
                 }
             } else {
                 sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoSubCommand()));
@@ -27,6 +66,10 @@ public class MainCommand implements TabExecutor {
             if (sender.hasPermission("commandwhitelist.reload")) {
                 sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/cw reload &b- Reload plugin configuration"));
             }
+            if (sender.hasPermission("commandwhitelist.admin")) {
+                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/cw add <group> <command> &b- Add command to group"));
+                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/cw remove <group> <command> &b- Remove command from a group"));
+            }
         }
         return true;
     }
@@ -34,10 +77,66 @@ public class MainCommand implements TabExecutor {
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         List<String> list = new ArrayList<>();
-        if(args.length == 1) {
-            if ("restart".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) {
+        if (args.length == 1) {
+            if ("reload".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) {
                 list.add("reload");
             }
+            if ("add".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) {
+                list.add("add");
+            }
+            if ("remove".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) {
+                list.add("remove");
+            }
+        } else if (args.length == 2) {
+            if (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove")) {
+                if (!sender.hasPermission("commandwhitelist.admin"))
+                    return list;
+                for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
+                    if (s.getKey().startsWith(args[1])) {
+                        list.add(s.getKey());
+                    }
+                }
+            }
+        } else if (args.length == 3) {
+            if (args[0].equalsIgnoreCase("remove")) {
+                if (!sender.hasPermission("commandwhitelist.admin"))
+                    return list;
+                try {
+                    for (String s : CommandWhitelist.getConfigCache().getPermList().get(args[1])) {
+                        if (s.startsWith(args[2])) {
+                            list.add(s);
+                        }
+                    }
+                } catch (NullPointerException ignored) {
+                }
+                return list;
+            }
+            if (args[0].equalsIgnoreCase("add")) {
+                if (!sender.hasPermission("commandwhitelist.admin"))
+                    return list;
+
+                for (HelpTopic s : CommandWhitelist.getPlugin().getServer().getHelpMap().getHelpTopics()) {
+                    String cmd = s.getName();
+                    if (!cmd.startsWith("/"))
+                        continue;
+                    try {
+                        if (cmd.contains(":")) {
+                            cmd = cmd.split(":")[1];
+                        }
+                    } catch (Exception e) {
+                        continue;
+                    }
+                    cmd = cmd.replace("/", "");
+
+                    if (CommandWhitelist.getConfigCache().getPermList().get(args[1]).contains(cmd))
+                        continue;
+
+                    if (cmd.startsWith(args[2])) {
+                        list.add(cmd);
+                    }
+                }
+                return list;
+            }
         }
         return list;
     }

src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java

@@ -1,7 +1,9 @@
 package eu.endermite.commandwhitelist.spigot.config;
 
 import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
-import org.bukkit.configuration.Configuration;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
 
 import java.util.HashMap;
 import java.util.List;
@@ -9,35 +11,98 @@ import java.util.Set;
 
 public class ConfigCache {
 
+    private FileConfiguration config;
     private HashMap<String, List<String>> permList = new HashMap<>();
-    private String prefix, commandDenied, noPermission, noSubCommand, configReloaded;
+    private HashMap<String, List<String>> permSubList = new HashMap<>();
+    private final String prefix, commandDenied, noPermission, noSubCommand, configReloaded, whitelistedCommand,
+            removedWhitelistedCommand, noSuchGroup, subCommandDenied;
+    private final List<String> commandDeniedList;
+    private boolean useProtocolLib;
 
-    public ConfigCache() {
+    public ConfigCache(FileConfiguration config) {
 
-        Configuration config = CommandWhitelist.getPlugin().getConfig();
+        this.config = config;
 
-        prefix = config.getString("messages.prefix");
-        commandDenied = config.getString("messages.command-denied");
-        noPermission = config.getString("messages.no-permission");
-        noSubCommand = config.getString("messages.no-such-subcommand");
-        configReloaded = config.getString("messages.config-reloaded");
+        prefix = config.getString("messages.prefix", "");
+        commandDenied = config.getString("messages.command-denied", null);
+        commandDeniedList = config.getStringList("messages.command-denied");
+        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");
+
+        useProtocolLib = config.getBoolean("use-protocollib-to-detect-commands", false);
 
         Set<String> perms = config.getConfigurationSection("commands").getKeys(false);
         for (String s : perms) {
             this.permList.put(s, config.getStringList("commands."+s));
         }
+
+        Set<String> subperms = config.getConfigurationSection("tabcompletions").getKeys(false);
+        for (String s : subperms) {
+            this.permSubList.put(s, config.getStringList("tabcompletions."+s));
+        }
     }
 
     public HashMap<String, List<String>> getPermList() {
         return permList;
     }
-
-    public List<String> getPerm(String s) {
-        return permList.get(s);
+    public HashMap<String, List<String>> getPermSubList() {
+        return permSubList;
+    }
+    public boolean addCommand(String command, String group) {
+        try {
+            if (this.permList.get(group).contains(command)) {
+                return true;
+            }
+            this.permList.get(group).add(command);
+            this.config.set("commands."+group, permList.get(group));
+            config.save(CommandWhitelist.getPlugin().getDataFolder()+"/config.yml");
+            for (Player player : Bukkit.getOnlinePlayers()) {
+                player.updateCommands();
+            }
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    public boolean removeCommand(String command, String group) {
+        try {
+            this.permList.get(group).remove(command);
+            this.config.set("commands."+group, permList.get(group));
+            config.save(CommandWhitelist.getPlugin().getDataFolder()+"/config.yml");
+            for (Player player : Bukkit.getOnlinePlayers()) {
+                player.updateCommands();
+            }
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
     }
     public String getPrefix() {return prefix;}
     public String getCommandDenied() {return commandDenied;}
+    public List<String> getCommandDeniedList() {
+        return commandDeniedList;
+    }
     public String getNoPermission() {return noPermission;}
     public String getNoSubCommand() {return  noSubCommand;}
     public String getConfigReloaded() {return  configReloaded;}
+    public String getWhitelistedCommand() {
+        return whitelistedCommand;
+    }
+    public String getRemovedWhitelistedCommand() {
+        return removedWhitelistedCommand;
+    }
+    public String getNoSuchGroup() {
+        return noSuchGroup;
+    }
+    public String getSubCommandDenied() {
+        return subCommandDenied;
+    }
+    public boolean isUseProtocolLib() {
+        return useProtocolLib;
+    }
 }

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java

@@ -19,18 +19,17 @@ public class LegacyPlayerTabChatCompleteListener {
     public static void protocol(CommandWhitelist plugin) {
         ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
         tabCompleteServerBound(protocolManager, plugin);
+        tabCompleteClientBound(protocolManager, plugin);
     }
 
     public static void tabCompleteServerBound(ProtocolManager protocolManager, Plugin plugin) {
         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")) {
+                    if (player.hasPermission("commandwhitelist.bypass"))
                         return;
-                    }
                     PacketContainer packet = event.getPacket();
                     String[] message = packet.getSpecificModifier(String[].class).read(0);
                     List<String> commandList = CommandsList.getCommands(player);
@@ -44,18 +43,43 @@ public class LegacyPlayerTabChatCompleteListener {
                             }
                         }
                     }
-
                     String[] toWrite = new String[components];
                     int counter = 0;
                     for (String cmd : finalList) {
                         toWrite[counter++] = cmd;
                     }
-
                     packet.getSpecificModifier(String[].class).write(0, toWrite);
-
                 } catch (Exception ignored) {}
             }
         });
     }
 
+    public static void tabCompleteClientBound(ProtocolManager protocolManager, Plugin plugin) {
+        protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.TAB_COMPLETE) {
+            @Override
+            public void onPacketReceiving(PacketEvent event) {
+                try {
+                    Player player = event.getPlayer();
+                    if (player.hasPermission("commandwhitelist.bypass")) {
+                        return;
+                    }
+                    PacketContainer packet = event.getPacket();
+                    String command = packet.getSpecificModifier(String.class).read(0);
+                    String label = CommandsList.getCommandLabel(command);
+                    List<String> commandList = CommandsList.getCommands(player);
+                    if (command.equals("/"))
+                        return;
+                    for (String cmd : commandList) {
+                        if (cmd.startsWith("/"+label+" "))
+                            return;
+                    }
+                    event.setCancelled(true);
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+        });
+    }
 }

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PacketCommandSendListener.java

@@ -0,0 +1,68 @@
+package eu.endermite.commandwhitelist.spigot.listeners;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.ProtocolManager;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
+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;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import java.util.List;
+import java.util.Map;
+
+public class PacketCommandSendListener {
+
+    public static void protocol(CommandWhitelist plugin) {
+        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
+        commandExecListener(protocolManager, plugin);
+    }
+
+    public static void commandExecListener(ProtocolManager protocolManager, Plugin plugin) {
+        protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
+            @Override
+            public void onPacketReceiving(PacketEvent event) {
+                PacketContainer packet = event.getPacket();
+                String string = packet.getStrings().read(0);
+                if (!string.startsWith("/"))
+                    return;
+                Player player = event.getPlayer();
+                if (player.hasPermission("commandwhitelist.bypass"))
+                    return;
+                String cmd = string.replace("/", "");
+                String[] split = cmd.split("\\s+");
+                String command = split[0].toLowerCase();
+                for (Map.Entry<String, List<String>> 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) || command.startsWith(comm + " ")) {
+                            List<String> bannedSubCommands = CommandsList.getSuggestions(player);
+                            for (String bannedSubCommand : bannedSubCommands) {
+                                if (cmd.startsWith(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('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied())));
+
+            }
+        });
+    }
+}

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java

@@ -1,41 +1,47 @@
 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;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-
 import java.util.List;
 import java.util.Map;
 
 public class PlayerCommandPreProcessListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();
-
         if (player.hasPermission("commandwhitelist.bypass"))
             return;
-
         String command = event.getMessage().toLowerCase();
-
+        if (command.startsWith("/"))
+            command = command.substring(1);
         for (Map.Entry<String, List<String>> 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))
+                if (command.equalsIgnoreCase(comm) || command.startsWith(comm + " ")) {
+                    List<String> bannedSubCommands = CommandsList.getSuggestions(player);
+                    for (String bannedSubCommand : bannedSubCommands) {
+                        if (command.startsWith(bannedSubCommand)) {
+                            event.setCancelled(true);
+                            ConfigCache config = CommandWhitelist.getConfigCache();
+                            player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied())));
                             return;
-                else if (command.startsWith("/" + comm + " ")) {
+                        }
+                    }
                     return;
                 }
             }
         }
         event.setCancelled(true);
-        player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getCommandDenied()));
+        ConfigCache config = CommandWhitelist.getConfigCache();
+        player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied())));
     }
-
 }

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java

@@ -8,21 +8,12 @@ import org.bukkit.event.Listener;
 import java.util.*;
 
 public class PlayerCommandSendListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
         Player player = event.getPlayer();
-
-        if (player.hasPermission("commandwhitelist.bypass")) {
+        if (player.hasPermission("commandwhitelist.bypass"))
             return;
-        }
-
         List<String> commandList = CommandsList.getCommands(player);
-
         event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
-
     }
-
-
-
 }

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java

@@ -0,0 +1,41 @@
+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();
+
+        List<String> blockedCommands = CommandsList.getSuggestions(player);
+        List<String> suggestions = event.getCompletions();
+
+        for (String s : blockedCommands) {
+            String slast = CommandsList.getLastArgument(s);
+            String scommand = s.replace(slast, "");
+            String[] cmdSplit = buffer.split(" ");
+            StringBuilder cmdBuilder = new StringBuilder();
+            for (int i = 0; i <= cmdSplit.length-1; i++)
+                cmdBuilder.append(cmdSplit[i]).append(" ");
+
+            String cmd = cmdBuilder.toString();
+            if (cmd.startsWith("/"+scommand)) {
+                // This sometimes throws exceptions. No clue why, it just does. try/catch is the only fix.
+                // Probably happening when plugin adds suggestions in this event on the same priority - not confirmed.
+                try {
+                    while (suggestions.contains(slast))
+                        suggestions.remove(slast);
+                } catch (Exception ignored) {}
+            }
+        }
+        event.setCompletions(suggestions);
+    }
+}

src/main/java/eu/endermite/commandwhitelist/velocity/CommandWhitelistVelocity.java

@@ -0,0 +1,112 @@
+package eu.endermite.commandwhitelist.velocity;
+
+import com.moandjiezana.toml.Toml;
+import com.velocitypowered.api.command.CommandMeta;
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.command.CommandExecuteEvent;
+import com.velocitypowered.api.event.command.PlayerAvailableCommandsEvent;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.plugin.Plugin;
+import com.velocitypowered.api.plugin.annotation.DataDirectory;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ProxyServer;
+import eu.endermite.commandwhitelist.api.CommandsList;
+import eu.endermite.commandwhitelist.velocity.command.VelocityMainCommand;
+import eu.endermite.commandwhitelist.velocity.config.VelocityConfigCache;
+import net.kyori.adventure.identity.Identity;
+import net.kyori.adventure.text.Component;
+import org.slf4j.Logger;
+import javax.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+public class CommandWhitelistVelocity {
+
+    private static CommandWhitelistVelocity plugin;
+    private static ProxyServer server;
+    private static VelocityConfigCache configCache;
+    private static Path folder;
+
+    @Inject
+    public CommandWhitelistVelocity(ProxyServer server, Logger logger, @DataDirectory final Path folder) {
+        CommandWhitelistVelocity.server = server;
+        CommandWhitelistVelocity.folder = folder;
+        CommandWhitelistVelocity.plugin = this;
+    }
+
+    private static Toml loadConfig(Path path) {
+        File folder = path.toFile();
+        File file = new File(folder, "config.toml");
+        if (!file.getParentFile().exists())
+            file.getParentFile().mkdirs();
+
+        if (!file.exists()) {
+            try (InputStream input = CommandWhitelistVelocity.class.getResourceAsStream("/" + file.getName())) {
+                if (input != null) {
+                    Files.copy(input, file.toPath());
+                } else {
+                    file.createNewFile();
+                }
+            } catch (IOException exception) {
+                exception.printStackTrace();
+                return null;
+            }
+        }
+        return new Toml().read(file);
+    }
+
+    private static void reloadConfig() {
+        configCache = new VelocityConfigCache(loadConfig(folder));
+    }
+
+    public static void reloadConfig(CommandSource source) {
+        server.getScheduler().buildTask(plugin, () -> {
+            reloadConfig();
+            source.sendMessage(Identity.nil(), Component.text(getConfigCache().getConfigReloaded()));
+        }).schedule();
+    }
+
+    @Subscribe
+    public void onProxyInitialization(ProxyInitializeEvent event) {
+        reloadConfig();
+        CommandMeta commandMeta = server.getCommandManager().metaBuilder("vcw").build();
+        server.getCommandManager().register(commandMeta, new VelocityMainCommand());
+    }
+
+    @Subscribe
+    public void onUserCommandSendEvent(PlayerAvailableCommandsEvent event) {
+        if (event.getPlayer().hasPermission("commandwhitelist.bypass"))
+            return;
+        List<String> allowedCommands = CommandsList.getCommands(event.getPlayer());
+        event.getRootNode().getChildren().removeIf((commandNode) ->
+                 server.getCommandManager().hasCommand(commandNode.getName())
+                        && !allowedCommands.contains(commandNode.getName())
+        );
+    }
+
+    @Subscribe
+    public void onUserCommandExecuteEvent(com.velocitypowered.api.event.command.CommandExecuteEvent event) {
+        if (!(event.getCommandSource() instanceof Player))
+            return;
+        Player player = (Player) event.getCommandSource();
+
+        if (player.hasPermission("commandwhitelist.bypass"))
+            return;
+
+        List<String> allowedCommands = CommandsList.getCommands(player);
+        String command = event.getCommand().split(" ")[0];
+        if (server.getCommandManager().hasCommand(command)
+                && !allowedCommands.contains(command))
+            event.setResult(CommandExecuteEvent.CommandResult.forwardToServer());
+    }
+
+    public static VelocityConfigCache getConfigCache() {
+        return configCache;
+    }
+
+}

src/main/java/eu/endermite/commandwhitelist/velocity/command/VelocityMainCommand.java

@@ -0,0 +1,48 @@
+package eu.endermite.commandwhitelist.velocity.command;
+
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.command.SimpleCommand;
+import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
+import net.kyori.adventure.text.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public class VelocityMainCommand implements SimpleCommand {
+
+    @Override
+    public void execute(final Invocation invocation) {
+        CommandSource source = invocation.source();
+        String[] args = invocation.arguments();
+        if (args.length > 0) {
+            if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
+                if (source.hasPermission("commandwhitelist.reload")) {
+                    CommandWhitelistVelocity.reloadConfig(source);
+                } else {
+                    source.sendMessage(Component.text(CommandWhitelistVelocity.getConfigCache().getNoPermission()));
+                }
+            }
+        } else {
+            source.sendMessage(Component.text("&bCommand Whitelist by YouHaveTrouble".replaceAll("&", "§")));
+            if (source.hasPermission("commandwhitelist.reload")) {
+                source.sendMessage(Component.text("&9/vcw reload &b- Reload velocity plugin configuration".replaceAll("&", "§")));
+            }
+        }
+    }
+
+    @Override
+    public CompletableFuture<List<String>> suggestAsync(Invocation invocation) {
+        CommandSource source = invocation.source();
+        String[] args = invocation.arguments();
+        return CompletableFuture.supplyAsync(() -> {
+            List<String> suggestions = new ArrayList<>();
+            if (args.length == 1) {
+                if (source.hasPermission("commandwhitelist.reload") && "reload".startsWith(args[0]))
+                    suggestions.add("reload");
+            }
+            return suggestions;
+        });
+    }
+}

src/main/java/eu/endermite/commandwhitelist/velocity/config/VelocityConfigCache.java

@@ -0,0 +1,38 @@
+package eu.endermite.commandwhitelist.velocity.config;
+
+import com.moandjiezana.toml.Toml;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class VelocityConfigCache {
+
+    private HashMap<String, List<String>> permList = new HashMap<>();
+    private final String noPermission, noSubCommand, configReloaded;
+
+
+    public VelocityConfigCache(Toml config) {
+
+        Toml messages = config.getTable("messages");
+        noPermission = messages.getString("no-permission", "&cYou don't have permission to do this.");
+        noSubCommand = messages.getString("no-such-subcommand", "&cNo subcommand by that name.");
+        configReloaded = messages.getString("config-reloaded", "&eConfiguration reloaded.");
+
+        Toml groups = config.getTable("commands");
+
+        for (Map.Entry<String, Object> set : groups.entrySet()) {
+            this.permList.put(set.getKey(), (List<String>) set.getValue());
+        }
+    }
+
+    public HashMap<String, List<String>> getPermList() {
+        return permList;
+    }
+    public String getNoPermission() {
+        return noPermission.replaceAll("&", "§");
+    }
+    public String getNoSubCommand() {return  noSubCommand.replaceAll("&", "§");}
+    public String getConfigReloaded() {return  configReloaded.replaceAll("&", "§");}
+
+
+}

src/main/resources/bungeeconfig.yml

@@ -5,14 +5,15 @@ messages:
   no-permission: "&cYou don't have permission to do this."
   no-such-subcommand: "&cNo subcommand by that name."
   config-reloaded: "&eConfiguration reloaded."
+  added-to-whitelist: "&eWhitelisted command &6%s &efor permission &6%s"
+  removed-from-whitelist: "&eRemoved command &6%s &efrom permission &6%s"
+  group-doesnt-exist: "&cGroup doesn't exist or error occured"
 
 commands:
   # Permissions that control what commands players can use
   # you can add unlimited amount of whitelists
 
-  # commandwhitelist.commands.default
-  # this will NOT be automatically given to players by default!
-  # you have to give this permission to default droup by yourself as there is no automatic way to do it for a plugin
+  # this will be automatically given to players by default
   default:
     - glist
     - server

src/main/resources/config.toml

@@ -0,0 +1,24 @@
+# This is velocity version of the config.
+[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."
+added-to-whitelist="&eWhitelisted command &6%s &efor permission &6%s"
+removed-from-whitelist="&eRemoved command &6%s &efrom permission &6%s"
+group-doesnt-exist="&cGroup doesn't exist or error occured"
+
+# Permissions that control what commands players can use
+# you can add unlimited amount of whitelists
+[commands]
+# this will be automatically given to players by default
+default= [
+  "velocity",
+  "server",
+]
+# commandwhitelist.commands.example
+example= [
+  "example"
+]

src/main/resources/config.yml

@@ -1,15 +1,23 @@
 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."
+  added-to-whitelist: "&eWhitelisted command &6%s &efor permission &6%s"
+  removed-from-whitelist: "&eRemoved command &6%s &efrom permission &6%s"
+  group-doesnt-exist: "&cGroup doesn't exist or error occured"
+
+# To cover the 1% of plugins that don't register their commands and/or aliases properly.
+# Do not enable if you don't have issues with aliased commands.
+# This requires server restart to take effect.
+use-protocollib-to-detect-commands: false
 
 commands:
   # Permissions that control what commands players can use
   # you can add unlimited amount of whitelists
 
-  # commandwhitelist.commands.default
   # this will be automatically given to players by default
   default:
     - help
@@ -28,3 +36,10 @@ commands:
   # commandwhitelist.commands.example
   example:
     - 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.example
+  example:
+    - help about

src/main/resources/plugin.yml

@@ -15,6 +15,8 @@ commands:
 permissions:
   commandwhitelist.reload:
     default: OP
+  commandwhitelist.admin:
+    default: OP
   commandwhitelist.bypass:
     default: OP
   commandwhitelist.commands.default:

src/main/resources/velocity-plugin.json

@@ -0,0 +1,9 @@
+{
+  "id":"commandwhitelist",
+  "name":"CommandWhitelist",
+  "version":"${project.version}",
+  "description":"Control what commands players can use",
+  "authors":["YouHaveTrouble"],
+  "dependencies":[],
+  "main":"eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity"
+}