version bump

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.3.2</version>
+    <version>1.5.0</version>
     <packaging>jar</packaging>
 
     <name>CommandWhitelist</name>
@@ -99,6 +99,7 @@
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
             <version>4.5.0</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

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

@@ -11,7 +11,6 @@ import java.util.Map;
 public class CommandsList {
 
     public static List<String> getCommands(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())) {
@@ -22,7 +21,6 @@ public class CommandsList {
     }
 
     public static List<String> getCommands(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())) {
@@ -32,4 +30,26 @@ public class CommandsList {
         return commandList;
     }
 
+    public static List<String> getSuggestions(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;
+    }
+
 }

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;
@@ -29,12 +29,14 @@ public final class CommandWhitelistBungee extends Plugin {
         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")) {
+        try {
-            this.getProxy().getPluginManager().registerListener(this, new BungeeTabCompleteListener());
+            Class.forName("io.github.waterfallmc.waterfall.conf.WaterfallConfiguration");
-        } else {
+            this.getProxy().getPluginManager().registerListener(this, new WaterfallDefineCommandsListener());
-            getLogger().info("Bungee tab completion requires Waterfall, FlameCord or other Waterfall fork.");
+        } 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);
@@ -77,7 +79,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,18 @@ 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 {
+public class BungeeMainCommand extends Command implements TabExecutor {
-    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 +24,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 +69,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 final Configuration config;
-    private String prefix, commandDenied, noPermission, noSubCommand, configReloaded;
+    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;
@@ -47,7 +49,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,7 +9,7 @@ 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) {

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());
 
@@ -49,7 +52,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 +73,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,11 +17,48 @@ 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")) {
+                if (!sender.hasPermission("commandwhitelist.reload")) {
-                    CommandWhitelist.getPlugin().reloadPluginConfig(sender);
-                } else {
                     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 +67,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 +78,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 (args.length == 1) {
-            if ("restart".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) {
+            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,89 @@ 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;
 
-    public ConfigCache() {
+    public ConfigCache(FileConfiguration config) {
 
-        Configuration config = CommandWhitelist.getPlugin().getConfig();
+        this.config = config;
 
-        prefix = config.getString("messages.prefix");
+        prefix = config.getString("messages.prefix", "");
-        commandDenied = config.getString("messages.command-denied");
+        commandDenied = config.getString("messages.command-denied", null);
-        noPermission = config.getString("messages.no-permission");
+        commandDeniedList = config.getStringList("messages.command-denied");
-        noSubCommand = config.getString("messages.no-such-subcommand");
+        subCommandDenied = config.getString("messages.subcommand-denied", "You cannot use this subcommand");
-        configReloaded = config.getString("messages.config-reloaded");
+        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");
 
         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 HashMap<String, List<String>> getPermSubList() {
-    public List<String> getPerm(String s) {
+        return permSubList;
-        return permList.get(s);
+    }
+    public boolean addCommand(String command, String group) {
+        try {
+            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;
+    }
 }

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")) {

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

@@ -1,6 +1,9 @@
 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;
@@ -15,27 +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<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 + " ")) {
-                    return;
+                    String rawCmd = event.getMessage();
-                else if (command.startsWith("/" + comm + " ")) {
+                    List<String> 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);
-        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/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<String> blockedCommands = CommandsList.getSuggestions(player);
+        List<String> 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);
+    }
+}

src/main/resources/bungeeconfig.yml

@@ -5,6 +5,9 @@ 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

src/main/resources/config.yml

@@ -1,9 +1,13 @@
 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"
 
 commands:
   # Permissions that control what commands players can use
@@ -28,3 +32,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

@@ -1,6 +1,7 @@
 name: CommandWhitelist
 prefix: CommandWhitelist
 version: ${project.version}
+api-version: 1.13
 main: eu.endermite.commandwhitelist.spigot.CommandWhitelist
 authors: [YouHaveTrouble]
 softdepend:
@@ -14,6 +15,8 @@ commands:
 permissions:
   commandwhitelist.reload:
     default: OP
+  commandwhitelist.admin:
+    default: OP
   commandwhitelist.bypass:
     default: OP
   commandwhitelist.commands.default: