version bump

fix tab complete with useProtocolLib

.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
+
+---
+
+

CommandWhitelistBukkit/.gitignore

@@ -0,0 +1,113 @@
+# User-specific stuff
+.idea/
+
+*.iml
+*.ipr
+*.iws
+
+# IntelliJ
+out/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+target/
+
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.flattened-pom.xml
+
+# Common working directory
+run/

CommandWhitelistBukkit/pom.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <artifactId>Bukkit</artifactId>
+    <packaging>jar</packaging>
+    <name>CommandWhitelist-Bukkit</name>
+
+    <description>You decide what commands players can use or tab complete on your server!</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <url>youhavetrouble.me</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>eu.endermite.bstats</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>net.kyori</pattern>
+                                    <shadedPattern>eu.endermite</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-bukkit</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>eu.endermite.commandwhitelist</groupId>
+            <artifactId>Common</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.6.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>brigadier</artifactId>
+            <version>1.0.17</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java

@@ -0,0 +1,129 @@
+package eu.endermite.commandwhitelist.bukkit;
+
+import eu.endermite.commandwhitelist.bukkit.command.MainCommandExecutor;
+import eu.endermite.commandwhitelist.bukkit.listeners.*;
+import eu.endermite.commandwhitelist.bukkit.listeners.protocollib.PacketCommandPreProcessListener;
+import eu.endermite.commandwhitelist.bukkit.listeners.protocollib.PacketCommandSendListener;
+import eu.endermite.commandwhitelist.common.CWGroup;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import java.util.Map;
+
+public class CommandWhitelistBukkit extends JavaPlugin {
+
+    private static CommandWhitelistBukkit commandWhitelist;
+    private static ConfigCache configCache;
+    private static BukkitAudiences audiences;
+
+    @Override
+    public void onEnable() {
+
+        commandWhitelist = this;
+        audiences = BukkitAudiences.create(this);
+
+        reloadPluginConfig();
+
+        Plugin protocollib = getServer().getPluginManager().getPlugin("ProtocolLib");
+
+        if (!getConfigCache().useProtocolLib || protocollib == null || !protocollib.isEnabled()) {
+            getServer().getPluginManager().registerEvents(new PlayerCommandPreProcessListener(), this);
+            getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
+        } else {
+            PacketCommandPreProcessListener.protocol(this);
+            PacketCommandSendListener.protocol(this);
+            getLogger().info(ChatColor.AQUA + "Using ProtocolLib for command filter!");
+        }
+        try {
+            // Use paper's async tab completions if possible
+            Class.forName("com.destroystokyo.paper.event.server.AsyncTabCompleteEvent");
+            getServer().getPluginManager().registerEvents(new AsyncTabCompleteBlockerListener(), this);
+        } catch (ClassNotFoundException ignored) {
+        }
+        getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
+
+        PluginCommand command = getCommand("commandwhitelist");
+        if (command != null) {
+            MainCommandExecutor executor = new MainCommandExecutor();
+            command.setExecutor(executor);
+            command.setTabCompleter(executor);
+        }
+
+        new Metrics(this, 8705);
+    }
+
+    private void reloadPluginConfig() {
+        File configFile = new File("plugins/CommandWhitelist/config.yml");
+        if (configCache == null)
+            configCache = new ConfigCache(configFile, true, getSLF4JLogger());
+        else
+            configCache.reloadConfig();
+    }
+
+    public void reloadPluginConfig(CommandSender sender) {
+        getServer().getScheduler().runTaskAsynchronously(this, () -> {
+            reloadPluginConfig();
+            for (Player p : Bukkit.getOnlinePlayers()) {
+                p.updateCommands();
+            }
+            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.config_reloaded));
+        });
+    }
+
+    public static CommandWhitelistBukkit getPlugin() {
+        return commandWhitelist;
+    }
+
+    public static ConfigCache getConfigCache() {
+        return configCache;
+    }
+
+    public static BukkitAudiences getAudiences() {
+        return audiences;
+    }
+
+    /**
+     * @param player Bukkit Player
+     * @return commands available to the player
+     */
+    public static HashSet<String> getCommands(org.bukkit.entity.Player player) {
+        HashSet<String> commandList = new HashSet<>();
+        HashMap<String, CWGroup> groups = configCache.getGroupList();
+        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                commandList.addAll(s.getValue().getCommands());
+            else if (player.hasPermission(s.getValue().getPermission()))
+                commandList.addAll(s.getValue().getCommands());
+        }
+        return commandList;
+    }
+
+    /**
+     * @param player Bukkit Player
+     * @return subcommands unavailable for the player
+     */
+    public static HashSet<String> getSuggestions(org.bukkit.entity.Player player) {
+        HashSet<String> suggestionList = new HashSet<>();
+        HashMap<String, CWGroup> groups = configCache.getGroupList();
+        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                suggestionList.addAll(s.getValue().getSubCommands());
+            if (player.hasPermission(s.getValue().getPermission())) continue;
+            suggestionList.addAll(s.getValue().getSubCommands());
+        }
+        return suggestionList;
+    }
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java

@@ -0,0 +1,83 @@
+package eu.endermite.commandwhitelist.bukkit.command;
+
+import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.commands.CWCommand;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.Bukkit;
+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;
+
+public class MainCommandExecutor implements TabExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
+        BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
+
+        if (args.length == 0) {
+            audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+            return true;
+        }
+        try {
+            CWCommand.CommandType commandType = CWCommand.CommandType.valueOf(args[0].toUpperCase());
+            switch (commandType) {
+                case RELOAD:
+                    if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
+                        audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
+                        return true;
+                    }
+                    CommandWhitelistBukkit.getPlugin().reloadPluginConfig(sender);
+                    return true;
+                case ADD:
+                    if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
+                        audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
+                        return true;
+                    }
+                    if (args.length == 3) {
+                        if (CWCommand.addToWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1]))
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().added_to_whitelist, args[2], args[1])));
+                        else
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1])));
+                    } else
+                        audiences.sender(sender).sendMessage(Component.text("/" + label + " add <group> <command>"));
+                    return true;
+                case REMOVE:
+                    if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
+                        audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
+                        return true;
+                    }
+                    if (args.length == 3) {
+                        if (CWCommand.removeFromWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1]))
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().removed_from_whitelist, args[2], args[1])));
+                        else
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1])));
+                    } else
+                        audiences.sender(sender).sendMessage(Component.text("/" + label + " remove <group> <command>"));
+                    return true;
+                case HELP:
+                default:
+                    audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+            }
+        } catch (IllegalArgumentException e) {
+            audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        List<String> serverCommands = new ArrayList<>();
+        for (HelpTopic topic : Bukkit.getHelpMap().getHelpTopics()) {
+            serverCommands.add(topic.getName());
+        }
+        return CWCommand.commandSuggestions(CommandWhitelistBukkit.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission()));
+    }
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/AsyncTabCompleteBlockerListener.java

@@ -0,0 +1,26 @@
+package eu.endermite.commandwhitelist.bukkit.listeners;
+
+import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
+import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.CommandUtil;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+
+public class AsyncTabCompleteBlockerListener implements Listener {
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onCommandTabComplete(AsyncTabCompleteEvent event) {
+        if (!(event.getSender() instanceof Player)) return;
+        Player player = (Player) event.getSender();
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+        String buffer = event.getBuffer();
+        if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) event.setCancelled(true);
+        if (event.getCompletions().isEmpty()) return;
+        event.setCompletions(CommandUtil.filterSuggestions(buffer, event.getCompletions(), CommandWhitelistBukkit.getSuggestions(player)));
+    }
+
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java

@@ -0,0 +1,42 @@
+package eu.endermite.commandwhitelist.bukkit.listeners;
+
+import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CommandUtil;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.HashSet;
+
+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 label = CommandUtil.getCommandLabel(event.getMessage().toLowerCase());
+        BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
+        ConfigCache config = CommandWhitelistBukkit.getConfigCache();
+
+        HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
+        if (!commands.contains(label)) {
+            event.setCancelled(true);
+            audiences.player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.command_denied));
+            return;
+        }
+
+        HashSet<String> bannedSubCommands = CommandWhitelistBukkit.getSuggestions(player);
+        for (String bannedSubCommand : bannedSubCommands) {
+            if (event.getMessage().toLowerCase().substring(1).startsWith(bannedSubCommand)) {
+                event.setCancelled(true);
+                audiences.player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.subcommand_denied));
+                return;
+            }
+        }
+
+
+    }
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandSendListener.java

@@ -0,0 +1,20 @@
+package eu.endermite.commandwhitelist.bukkit.listeners;
+
+import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import java.util.HashSet;
+
+public class PlayerCommandSendListener implements Listener {
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
+        Player player = event.getPlayer();
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+        HashSet<String> commandList = CommandWhitelistBukkit.getCommands(player);
+        event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
+    }
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/TabCompleteBlockerListener.java

@@ -0,0 +1,30 @@
+package eu.endermite.commandwhitelist.bukkit.listeners;
+
+import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.CommandUtil;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.TabCompleteEvent;
+
+public class TabCompleteBlockerListener implements Listener {
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onCommandTabComplete(TabCompleteEvent event) {
+        if (!(event.getSender() instanceof Player)) return;
+        Player player = (Player) event.getSender();
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+        String buffer = event.getBuffer();
+        if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) event.setCancelled(true);
+        if (event.getCompletions().isEmpty()) return;
+        event.setCompletions(
+                CommandUtil.filterSuggestions(
+                        buffer,
+                        event.getCompletions(),
+                        CommandWhitelistBukkit.getSuggestions(player)
+                )
+        );
+    }
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandPreProcessListener.java

@@ -0,0 +1,57 @@
+package eu.endermite.commandwhitelist.bukkit.listeners.protocollib;
+
+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.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.CommandUtil;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.HashSet;
+
+public class PacketCommandPreProcessListener {
+
+    public static void protocol(CommandWhitelistBukkit 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(CWPermission.BYPASS.permission())) return;
+
+                ConfigCache config = CommandWhitelistBukkit.getConfigCache();
+                String label = CommandUtil.getCommandLabel(string.toLowerCase());
+                HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
+                if (!commands.contains(label)) {
+                    event.setCancelled(true);
+                    CommandWhitelistBukkit.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.command_denied));
+                    return;
+                }
+
+                HashSet<String> bannedSubCommands = CommandWhitelistBukkit.getSuggestions(player);
+                for (String bannedSubCommand : bannedSubCommands) {
+                    if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) {
+                        event.setCancelled(true);
+                        CommandWhitelistBukkit.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.subcommand_denied));
+                        return;
+                    }
+                }
+            }
+        });
+    }
+}

CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandSendListener.java

@@ -0,0 +1,40 @@
+package eu.endermite.commandwhitelist.bukkit.listeners.protocollib;
+
+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 com.mojang.brigadier.tree.RootCommandNode;
+import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.HashSet;
+
+public class PacketCommandSendListener {
+
+    public static void protocol(CommandWhitelistBukkit plugin) {
+        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
+        commandSendListener(protocolManager, plugin);
+    }
+
+    public static void commandSendListener(ProtocolManager protocolManager, Plugin plugin) {
+        protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Server.COMMANDS) {
+            @Override
+            public void onPacketSending(PacketEvent event) {
+                Player player = event.getPlayer();
+                if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+
+                HashSet<String> commandList = CommandWhitelistBukkit.getCommands(player);
+                PacketContainer packet = event.getPacket();
+                RootCommandNode<?> node = (RootCommandNode<?>) packet.getModifier().getValues().get(0);
+                node.getChildren().removeIf((cmd) -> !commandList.contains(cmd.getName()));
+            }
+        });
+    }
+
+}

CommandWhitelistBukkit/src/main/resources/plugin.yml

@@ -1,8 +1,11 @@
 name: CommandWhitelist
+prefix: CommandWhitelist
 version: ${project.version}
-main: eu.endermite.commandwhitelist.spigot.CommandWhitelist
 api-version: 1.13
+main: eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit
 authors: [YouHaveTrouble]
+softdepend:
+  - ProtocolLib
 description: Control what commands players can use
 commands:
   commandwhitelist:
@@ -12,7 +15,7 @@ commands:
 permissions:
   commandwhitelist.reload:
     default: OP
-  commandwhitelist.bypass:
+  commandwhitelist.admin:
     default: OP
-  commandwhitelist.commands.default:
-    default: true
+  commandwhitelist.bypass:
+    default: OP

CommandWhitelistCommon/pom.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <artifactId>Common</artifactId>
+    <packaging>jar</packaging>
+    <name>CommandWhitelist-Common</name>
+
+    <description>You decide what commands players can use or tab complete on your server!</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <url>youhavetrouble.me</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>pluginwiki-repo</id>
+            <url>https://ci.pluginwiki.us/plugin/repository/everything/</url>
+        </repository>
+        <repository>
+            <id>velocitypowered-repo</id>
+            <url>https://repo.velocitypowered.com/releases/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.thatsmusic99</groupId>
+            <artifactId>ConfigurationMaster-API</artifactId>
+            <version>v2.0.0-BETA-1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>1.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.waterfallmc</groupId>
+            <artifactId>waterfall-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/CWGroup.java

@@ -0,0 +1,58 @@
+package eu.endermite.commandwhitelist.common;
+
+import java.util.*;
+
+public class CWGroup {
+
+    private final String id, permission;
+    private final HashSet<String> commands = new HashSet<>();
+    private final HashSet<String> subCommands = new HashSet<>();
+
+    public CWGroup(String id, Collection<String> commands, Collection<String> subCommands) {
+        this.id = id;
+        this.permission = "commandwhitelist.group."+id;
+        this.commands.addAll(commands);
+        this.subCommands.addAll(subCommands);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getPermission() {
+        return permission;
+    }
+
+    public HashSet<String> getCommands() {
+        return commands;
+    }
+
+    public void addCommand(String command) {
+        commands.add(command);
+    }
+
+    public void removeCommand(String command) {
+        commands.remove(command);
+    }
+
+    public HashSet<String> getSubCommands() {
+        return subCommands;
+    }
+
+    public void addSubCommand(String subCommand) {
+        subCommands.add(subCommand);
+    }
+
+    public void removeSubCommand(String subCommand) {
+        subCommands.remove(subCommand);
+    }
+
+    public HashMap<String, Object> serialize() {
+        HashMap<String, Object> serializedGroup = new LinkedHashMap<>();
+        List<String> commands = new ArrayList<>(this.commands);
+        List<String> subCommands = new ArrayList<>(this.subCommands);
+        serializedGroup.put("commands", commands);
+        serializedGroup.put("subcommands", subCommands);
+        return serializedGroup;
+    }
+}

CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/CWPermission.java

@@ -0,0 +1,31 @@
+package eu.endermite.commandwhitelist.common;
+
+public enum CWPermission {
+
+    ADMIN("commandwhitelist.admin"),
+    RELOAD("commandwhitelist.reload"),
+    BYPASS("commandwhitelist.bypass");
+
+    private final String permission;
+
+    CWPermission(String permission) {
+        this.permission = permission;
+    }
+
+    public String permission() {
+        return permission;
+    }
+
+    /**
+     * Allows to check specific group permission
+     * @param configCache
+     * @param groupId
+     * @return
+     */
+    public static String getGroupPermission(ConfigCache configCache, String groupId) {
+        if (configCache.getGroupList().containsKey(groupId))
+            return configCache.getGroupList().get(groupId).getPermission();
+        return null;
+    }
+
+}

CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/CommandUtil.java

@@ -0,0 +1,64 @@
+package eu.endermite.commandwhitelist.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class CommandUtil {
+
+    /**
+     * Filters blocked command suggestions from provided collection of strings
+     *
+     * @param buffer             Command buffer
+     * @param suggestions        Full suggestions list
+     * @param blockedSubCommands Subcommands to filter out
+     * @return Filtered list of suggestions
+     */
+    public static List<String> filterSuggestions(String buffer, Collection<String> suggestions, Collection<String> blockedSubCommands) {
+        if (buffer.startsWith("/"))
+            buffer = buffer.substring(1);
+        for (String s : blockedSubCommands) {
+            String slast = getLastArgument(s);
+            String scommand = cutLastArgument(s);
+            if (buffer.startsWith(scommand)) {
+                while (suggestions.contains(slast))
+                    suggestions.remove(slast);
+            }
+        }
+        return new ArrayList<>(suggestions);
+    }
+
+    /**
+     * @param cmd The command
+     * @return Last argument of the command
+     */
+    public static String getLastArgument(String cmd) {
+        String[] parts = cmd.split(" ");
+        if (parts.length == 0) return "";
+        return parts[parts.length - 1];
+    }
+
+    /**
+     * @param cmd The command
+     * @return Command without the last argument.
+     */
+    public static String cutLastArgument(String cmd) {
+        String[] cmdSplit = cmd.split(" ");
+        StringBuilder cmdBuilder = new StringBuilder();
+        for (int i = 0; i <= cmdSplit.length - 2; i++)
+            cmdBuilder.append(cmdSplit[i]).append(" ");
+        return cmdBuilder.toString();
+    }
+
+    /**
+     * @param cmd The command
+     * @return Command label
+     */
+    public static String getCommandLabel(String cmd) {
+        String[] parts = cmd.split(" ");
+        if (parts[0].startsWith("/"))
+            parts[0] = parts[0].substring(1);
+        return parts[0];
+    }
+
+}

CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java

@@ -0,0 +1,156 @@
+package eu.endermite.commandwhitelist.common;
+
+import io.github.thatsmusic99.configurationmaster.api.ConfigFile;
+import io.github.thatsmusic99.configurationmaster.api.ConfigSection;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
+public class ConfigCache {
+
+    private final File configFile;
+    private ConfigFile config;
+    private final Object logger;
+    private final boolean canDoProtocolLib;
+    private final HashMap<String, CWGroup> groupList = new LinkedHashMap<>();
+    public String prefix, command_denied, no_permission, no_such_subcommand, config_reloaded, added_to_whitelist,
+            removed_from_whitelist, group_doesnt_exist, subcommand_denied;
+    public boolean useProtocolLib = false;
+
+    public ConfigCache(File configFile, boolean canDoProtocolLib, Object logger) {
+        this.configFile = configFile;
+        this.canDoProtocolLib = canDoProtocolLib;
+        this.logger = logger;
+
+        reloadConfig();
+    }
+
+    public boolean reloadConfig() {
+
+        createFiles();
+        config = ConfigFile.loadConfig(configFile);
+
+        config.addDefault("messages.prefix", "CommandWhitelist > ");
+        config.addDefault("messages.command_denied", "No such command.");
+        config.addDefault("messages.subcommand_denied", "You cannot use this subcommand");
+        config.addDefault("messages.no_permission", "<red>You don't have permission to do this.");
+        config.addDefault("messages.no_such_subcommand", "<red>No subcommand by that name.");
+        config.addDefault("messages.config_reloaded", "<yellow>Configuration reloaded.");
+        config.addDefault("messages.added_to_whitelist", "<yellow>Whitelisted command <gold>%s <yellow>for permission <gold>%s");
+        config.addDefault("messages.removed_from_whitelist", "<yellow>Removed command <gold>%s <yellow>from permission <gold>%s");
+        config.addDefault("messages.group_doesnt_exist", "<red>Group doesn't exist or error occured");
+
+        config.addComment("messages", "Messages use MiniMessage formatting (https://docs.adventure.kyori.net/minimessage.html#format)");
+
+        if (canDoProtocolLib)
+            config.addDefault("use_protocollib", false, "Do not enable if you don't have issues with aliased commands.\nThis requires server restart to take effect.");
+
+        if (config.isNew()) {
+            List<String> exampleCommands = new ArrayList<>();
+            exampleCommands.add("example");
+            List<String> exampleSubCommands = new ArrayList<>();
+            exampleSubCommands.add("example of");
+
+            config.addExample("groups.example.commands", exampleCommands, "This is the WHITELIST of commands that players will be able to see/use in the group \"example\"");
+            config.addExample("groups.example.subcommands", exampleSubCommands, "This is the BLACKLIST of subcommands that players will NOT be able to see/use in the group \"example\"");
+            config.addComment("groups.example", "All groups except from default require commandwhitelist.group.<group_name> permission\ncommandwhitelist.group.example in this case\n If you wish to leave the list empty, put \"commands: []\" or \"subcommands: []\"");
+        }
+
+        config.makeSectionLenient("groups");
+        List<String> defaultCommands = new ArrayList<>();
+        defaultCommands.add("help");
+        defaultCommands.add("spawn");
+        defaultCommands.add("bal");
+        defaultCommands.add("balance");
+        defaultCommands.add("baltop");
+        defaultCommands.add("pay");
+        defaultCommands.add("r");
+        defaultCommands.add("msg");
+        defaultCommands.add("tpa");
+        defaultCommands.add("tpahere");
+        defaultCommands.add("tpaccept");
+        defaultCommands.add("tpdeny");
+        defaultCommands.add("warp");
+        List<String> defaultSubcommands = new ArrayList<>();
+        defaultSubcommands.add("help about");
+
+        config.addDefault("groups.default", new CWGroup("default", defaultCommands, defaultSubcommands).serialize());
+
+        prefix = config.getString("messages.prefix");
+        command_denied = config.getString("messages.command_denied");
+        subcommand_denied = config.getString("messages.subcommand_denied");
+        no_permission = config.getString("messages.no_permission");
+        no_such_subcommand = config.getString("messages.no_such_subcommand");
+        config_reloaded = config.getString("messages.config_reloaded");
+        added_to_whitelist = config.getString("messages.added_to_whitelist");
+        removed_from_whitelist = config.getString("messages.removed_from_whitelist");
+        group_doesnt_exist = config.getString("messages.group_doesnt_exist");
+        useProtocolLib = config.getBoolean("use_protocollib");
+
+        ConfigSection groupSection = config.getConfigSection("groups");
+        for (String key : groupSection.getKeys(false)) {
+            groupList.put(key, loadCWGroup(key, groupSection));
+        }
+
+        return saveConfig();
+    }
+
+    private boolean saveConfig() {
+        try {
+            config.save();
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    private void createFiles() {
+        try {
+            File parent = new File(configFile.getParent());
+            if (!parent.exists())
+                parent.mkdir();
+            if (!configFile.exists())
+                configFile.createNewFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public CWGroup loadCWGroup(String id, ConfigSection section) {
+        HashSet<String> commands = new HashSet<>();
+        for (String cmd : section.getStringList(id + ".commands")) {
+            if (cmd.contains(" ")) {
+                String[] cmdSplit = cmd.split(" ");
+                warn("CommandWhitelist - \"" + cmd + "\" is not a command. Loading it as \"" + cmdSplit[0] + "\".");
+                cmd = cmdSplit[0];
+            }
+            if (commands.contains(cmd)) continue;
+            commands.add(cmd);
+        }
+
+        List<String> subCommands = section.getStringList(id + ".subcommands");
+        return new CWGroup(id, commands, subCommands);
+    }
+
+    public void saveCWGroup(String id, CWGroup group) {
+        config.set("groups." + id, group.serialize());
+        saveConfig();
+    }
+
+    public HashMap<String, CWGroup> getGroupList() {
+        return groupList;
+    }
+
+    private void warn(String log) {
+        if (logger instanceof org.slf4j.Logger) {
+            ((org.slf4j.Logger) logger).warn(log);
+            return;
+        }
+        if (logger instanceof java.util.logging.Logger) {
+            ((java.util.logging.Logger) logger).warning(log);
+            return;
+        }
+    }
+
+}

CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java

@@ -0,0 +1,108 @@
+package eu.endermite.commandwhitelist.common.commands;
+
+import eu.endermite.commandwhitelist.common.CWGroup;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class CWCommand {
+
+    public static boolean addToWhitelist(ConfigCache configCache, String command, String group) {
+        CWGroup cwGroup = configCache.getGroupList().get(group);
+        if (cwGroup == null) return false;
+        cwGroup.addCommand(command);
+        configCache.saveCWGroup(group, cwGroup);
+        return true;
+    }
+
+    public static boolean removeFromWhitelist(ConfigCache configCache, String command, String group) {
+        CWGroup cwGroup = configCache.getGroupList().get(group);
+        if (cwGroup == null)
+            return false;
+        cwGroup.removeCommand(command);
+        configCache.saveCWGroup(group, cwGroup);
+        return true;
+    }
+
+    public static Component helpComponent(String baseCommand, boolean showReloadCommand, boolean showAdminCommands) {
+        Component component = MiniMessage.markdown().parse("<rainbow><bold>CommandWhitelist by YouHaveTrouble")
+                .append(Component.newline());
+        component = component.append(Component.text("/" + baseCommand + " help").color(NamedTextColor.AQUA).append(Component.text(" - Displays this message").color(NamedTextColor.BLUE)));
+        if (showReloadCommand) {
+            component = component.append(Component.newline());
+            component = component.append(Component.text("/" + baseCommand + " reload").color(NamedTextColor.AQUA).append(Component.text(" - Reloads plugin configuration").color(NamedTextColor.BLUE)));
+        }
+        if (showAdminCommands) {
+            component = component.append(Component.newline());
+            component = component.append(Component.text("/" + baseCommand + " add <group> <command>").color(NamedTextColor.AQUA).append(Component.text(" - Add a command to selected permission group").color(NamedTextColor.BLUE)));
+            component = component.append(Component.newline());
+            component = component.append(Component.text("/" + baseCommand + " remove <group> <command>").color(NamedTextColor.AQUA).append(Component.text(" - Removes a command from selected permission group").color(NamedTextColor.BLUE)));
+        }
+        return component;
+    }
+
+    public enum CommandType {
+        ADD, REMOVE, HELP, RELOAD
+    }
+
+    public static List<String> commandSuggestions(ConfigCache config, Collection<String> serverCommands, String[] args, boolean reloadPerm, boolean adminPerm) {
+        List<String> list = new ArrayList<>();
+        switch (args.length) {
+            case 0:
+            case 1:
+                if ("reload".startsWith(args[0]) && reloadPerm)
+                    list.add("reload");
+                if ("add".startsWith(args[0]) && adminPerm)
+                    list.add("add");
+                if ("remove".startsWith(args[0]) && adminPerm)
+                    list.add("remove");
+                return list;
+            case 2:
+                if (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove")) {
+                    if (!adminPerm) return list;
+                    for (String s : config.getGroupList().keySet()) {
+                        if (s.startsWith(args[1]))
+                            list.add(s);
+                    }
+                }
+                return list;
+            case 3:
+                if (args[0].equalsIgnoreCase("remove")) {
+                    if (!adminPerm) return list;
+                    CWGroup group = config.getGroupList().get(args[1]);
+                    if (group == null) return list;
+                    for (String s : group.getCommands()) {
+                        if (s.startsWith(args[2]))
+                            list.add(s);
+                    }
+                    return list;
+                }
+                if (args[0].equalsIgnoreCase("add")) {
+                    if (!adminPerm) return list;
+                    CWGroup group = config.getGroupList().get(args[1]);
+                    if (group == null) return list;
+                    for (String cmd : serverCommands) {
+                        if (cmd.startsWith("/"))
+                            cmd = cmd.substring(1);
+                        if (cmd.contains(":")) {
+                            String[] cmdSplit = cmd.split(":");
+                            if (cmdSplit.length < 2) continue;
+                            cmd = cmdSplit[1];
+                        }
+                        if (group.getCommands().contains(cmd)) continue;
+                        if (cmd.startsWith(args[2]))
+                            list.add(cmd);
+                    }
+                    return list;
+                }
+            default:
+                return list;
+        }
+    }
+
+}

CommandWhitelistVelocity/.gitignore

@@ -0,0 +1,113 @@
+# User-specific stuff
+.idea/
+
+*.iml
+*.ipr
+*.iws
+
+# IntelliJ
+out/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+target/
+
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.flattened-pom.xml
+
+# Common working directory
+run/

CommandWhitelistVelocity/pom.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <artifactId>Velocity</artifactId>
+    <packaging>jar</packaging>
+    <name>CommandWhitelist-Velocity</name>
+
+    <description>You decide what commands players can use or tab complete on your server!</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <url>youhavetrouble.me</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>eu.endermite.bstats</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>velocitypowered-repo</id>
+            <url>https://repo.velocitypowered.com/releases/</url>
+        </repository>
+        <repository>
+            <id>minecraft-libraries</id>
+            <url>https://libraries.minecraft.net/</url>
+        </repository>
+        <repository>
+            <id>spongepowered-repo</id>
+            <url>https://repo.spongepowered.org/maven</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>3.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>eu.endermite.commandwhitelist</groupId>
+            <artifactId>Common</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-velocity</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

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

@@ -0,0 +1,132 @@
+package eu.endermite.commandwhitelist.velocity;
+
+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.annotation.DataDirectory;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ProxyServer;
+import eu.endermite.commandwhitelist.common.CWGroup;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import eu.endermite.commandwhitelist.velocity.command.VelocityMainCommand;
+import net.kyori.adventure.identity.Identity;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bstats.charts.SimplePie;
+import org.bstats.velocity.Metrics;
+import org.slf4j.Logger;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+public class CommandWhitelistVelocity {
+
+    private static CommandWhitelistVelocity plugin;
+    private static ProxyServer server;
+    private static ConfigCache configCache;
+    private static Path folder;
+    private static Logger logger;
+    private final Metrics.Factory metricsFactory;
+
+    @Inject
+    public CommandWhitelistVelocity(ProxyServer server, Logger logger, @DataDirectory final Path folder, Metrics.Factory metricsFactory) {
+        CommandWhitelistVelocity.server = server;
+        CommandWhitelistVelocity.folder = folder;
+        CommandWhitelistVelocity.plugin = this;
+        CommandWhitelistVelocity.logger = logger;
+        this.metricsFactory = metricsFactory;
+
+    }
+
+    private static void reloadConfig() {
+        if (configCache == null)
+            configCache = new ConfigCache(new File(String.valueOf(folder), "config.yml"), false, logger);
+        else
+            configCache.reloadConfig();
+    }
+
+    public static void reloadConfig(CommandSource source) {
+        server.getScheduler().buildTask(plugin, () -> {
+            reloadConfig();
+            source.sendMessage(Identity.nil(), MiniMessage.markdown().parse(getConfigCache().prefix+getConfigCache().config_reloaded));
+        }).schedule();
+    }
+
+    @Subscribe
+    public void onProxyInitialization(ProxyInitializeEvent event) {
+        reloadConfig();
+        CommandMeta commandMeta = server.getCommandManager().metaBuilder("vcw").build();
+        server.getCommandManager().register(commandMeta, new VelocityMainCommand());
+        Metrics metrics = metricsFactory.make(this, 8704);
+        metrics.addCustomChart(new SimplePie("proxy", ()-> "Velocity"));
+    }
+
+    @Subscribe
+    public void onUserCommandSendEvent(PlayerAvailableCommandsEvent event) {
+        Player player = event.getPlayer();
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+        HashSet<String> allowedCommands = CommandWhitelistVelocity.getCommands(player);
+        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(CWPermission.BYPASS.permission())) return;
+
+        HashSet<String> allowedCommands = CommandWhitelistVelocity.getCommands(player);
+        String command = event.getCommand().split(" ")[0];
+        if (server.getCommandManager().hasCommand(command)
+                && !allowedCommands.contains(command))
+            event.setResult(CommandExecuteEvent.CommandResult.forwardToServer());
+    }
+
+    public static ConfigCache getConfigCache() {
+        return configCache;
+    }
+
+    /**
+     * @param player Velocity Player
+     * @return commands available to the player
+     */
+    public static HashSet<String> getCommands(Player player) {
+        HashMap<String, CWGroup> groups = configCache.getGroupList();
+        HashSet<String> commandList = new HashSet<>();
+        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
+            CWGroup group = s.getValue();
+            if (s.getKey().equalsIgnoreCase("default"))
+                commandList.addAll(group.getCommands());
+            else if (player.hasPermission(group.getPermission()))
+                commandList.addAll(group.getCommands());
+        }
+        return commandList;
+    }
+
+    /**
+     * @param player Velocity Player
+     * @return subcommands unavailable for the player
+     */
+    public static HashSet<String> getSuggestions(Player player, HashMap<String, CWGroup> groups) {
+        HashSet<String> suggestionList = new HashSet<>();
+        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                suggestionList.addAll(s.getValue().getSubCommands());
+            if (player.hasPermission(s.getValue().getPermission())) continue;
+            suggestionList.addAll(s.getValue().getSubCommands());
+        }
+        return suggestionList;
+    }
+
+}

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

@@ -0,0 +1,84 @@
+package eu.endermite.commandwhitelist.velocity.command;
+
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.command.SimpleCommand;
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.commands.CWCommand;
+import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public class VelocityMainCommand implements SimpleCommand {
+
+    @Override
+    public void execute(final Invocation invocation) {
+        CommandSource sender = invocation.source();
+        String[] args = invocation.arguments();
+        String label = invocation.alias();
+
+        if (args.length == 0) {
+            sender.sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+            return;
+        }
+
+        try {
+            CWCommand.CommandType commandType = CWCommand.CommandType.valueOf(args[0].toUpperCase());
+            switch (commandType) {
+                case RELOAD:
+                    if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
+                        sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
+                        return;
+                    }
+                    CommandWhitelistVelocity.reloadConfig(sender);
+                    return;
+                case ADD:
+                    if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
+                        sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
+                        return;
+                    }
+                    if (args.length == 3) {
+                        if (CWCommand.addToWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1]))
+                            sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().added_to_whitelist, args[2], args[1])));
+                        else
+                            sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1])));
+                    } else
+                        sender.sendMessage(Component.text("/" + label + " add <group> <command>"));
+                    return;
+                case REMOVE:
+                    if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
+                        sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
+                        return;
+                    }
+                    if (args.length == 3) {
+                        if (CWCommand.removeFromWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1]))
+                            sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().removed_from_whitelist, args[2], args[1])));
+                        else
+                            sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1])));
+                    } else
+                        sender.sendMessage(Component.text("/" + label + " remove <group> <command>"));
+                    return;
+                case HELP:
+                default:
+                    sender.sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+            }
+
+        } catch (IllegalArgumentException e) {
+            sender.sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+        }
+        return;
+    }
+
+    @Override
+    public CompletableFuture<List<String>> suggestAsync(Invocation invocation) {
+        CommandSource source = invocation.source();
+        String[] args = invocation.arguments();
+        return CompletableFuture.supplyAsync(() -> {
+            List<String> serverCommands = new ArrayList<>();
+            return CWCommand.commandSuggestions(CommandWhitelistVelocity.getConfigCache(), serverCommands, args, source.hasPermission(CWPermission.RELOAD.permission()), source.hasPermission(CWPermission.ADMIN.permission()));
+        });
+    }
+}

CommandWhitelistVelocity/src/main/resources/velocity-plugin.json

@@ -0,0 +1,9 @@
+{
+  "id":"commandwhitelist",
+  "name":"CommandWhitelist",
+  "version":"${project.version}",
+  "description":"You decide what commands players can use or tab complete on your server!",
+  "authors":["YouHaveTrouble"],
+  "dependencies":[],
+  "main":"eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity"
+}

CommandWhitelistWaterfall/.gitignore

@@ -0,0 +1,113 @@
+# User-specific stuff
+.idea/
+
+*.iml
+*.ipr
+*.iws
+
+# IntelliJ
+out/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+target/
+
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.flattened-pom.xml
+
+# Common working directory
+run/

CommandWhitelistWaterfall/pom.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.2.0</version>
+    </parent>
+
+    <artifactId>Waterfall</artifactId>
+    <packaging>jar</packaging>
+    <name>CommandWhitelist-Waterfall</name>
+
+    <description>You decide what commands players can use or tab complete on your server!</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <url>youhavetrouble.me</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>eu.endermite.bstats</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>net.kyori</pattern>
+                                    <shadedPattern>eu.endermite</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>eu.endermite.commandwhitelist</groupId>
+            <artifactId>Common</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.waterfallmc</groupId>
+            <artifactId>waterfall-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-bungeecord</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bungeecord</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/CommandWhitelistWaterfall.java

@@ -0,0 +1,108 @@
+package eu.endermite.commandwhitelist.waterfall;
+
+import eu.endermite.commandwhitelist.common.CWGroup;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import eu.endermite.commandwhitelist.waterfall.command.BungeeMainCommand;
+import eu.endermite.commandwhitelist.waterfall.listeners.BungeeChatEventListener;
+import eu.endermite.commandwhitelist.waterfall.listeners.BungeeTabcompleteListener;
+import eu.endermite.commandwhitelist.waterfall.listeners.WaterfallDefineCommandsListener;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Plugin;
+import org.bstats.bungeecord.Metrics;
+import org.bstats.charts.SimplePie;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+public final class CommandWhitelistWaterfall extends Plugin {
+
+    private static CommandWhitelistWaterfall plugin;
+    private static ConfigCache configCache;
+    private static BungeeAudiences audiences;
+
+    @Override
+    public void onEnable() {
+        plugin = this;
+        getLogger().info("Running on "+ ChatColor.DARK_AQUA+getProxy().getName());
+        loadConfig();
+        audiences = BungeeAudiences.create(this);
+        Metrics metrics = new Metrics(this, 8704);
+
+        this.getProxy().getPluginManager().registerListener(this, new BungeeChatEventListener());
+        try {
+            Class.forName("io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent");
+            metrics.addCustomChart(new SimplePie("proxy", () -> "Waterfall"));
+            this.getProxy().getPluginManager().registerListener(this, new WaterfallDefineCommandsListener());
+        } catch (ClassNotFoundException e) {
+            metrics.addCustomChart(new SimplePie("proxy", () -> "Bungee"));
+            getLogger().severe("Bungee command completion blocker requires Waterfall other Waterfall fork.");
+        }
+        this.getProxy().getPluginManager().registerListener(this, new BungeeTabcompleteListener());
+        getProxy().getPluginManager().registerCommand(this, new BungeeMainCommand("bcw"));
+
+
+    }
+
+    public static CommandWhitelistWaterfall getPlugin() {
+        return plugin;
+    }
+    public static ConfigCache getConfigCache() {
+        return configCache;
+    }
+
+    public static BungeeAudiences getAudiences() {
+        return audiences;
+    }
+
+    public void loadConfig() {
+        if (configCache == null)
+            configCache = new ConfigCache(new File(getDataFolder(), "config.yml"), false, getLogger());
+        else
+            configCache.reloadConfig();
+    }
+
+    public void loadConfigAsync(CommandSender sender) {
+        getProxy().getScheduler().runAsync(this, () -> {
+            loadConfig();
+            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistWaterfall.getConfigCache().prefix + CommandWhitelistWaterfall.getConfigCache().config_reloaded));
+        });
+    }
+
+    /**
+     * @param player Bungee Player
+     * @return commands available to the player
+     */
+    public static HashSet<String> getCommands(ProxiedPlayer player) {
+        HashSet<String> commandList = new HashSet<>();
+        HashMap<String, CWGroup> groups = configCache.getGroupList();
+        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                commandList.addAll(s.getValue().getCommands());
+            else if (player.hasPermission(s.getValue().getPermission()))
+                commandList.addAll(s.getValue().getCommands());
+        }
+        return commandList;
+    }
+
+    /**
+     * @param player Bungee Player
+     * @return subcommands unavailable for the player
+     */
+    public static HashSet<String> getSuggestions(ProxiedPlayer player) {
+        HashMap<String, CWGroup> groups = configCache.getGroupList();
+        HashSet<String> suggestionList = new HashSet<>();
+        for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
+            if (s.getKey().equalsIgnoreCase("default"))
+                suggestionList.addAll(s.getValue().getSubCommands());
+            if (player.hasPermission(s.getValue().getPermission())) continue;
+            suggestionList.addAll(s.getValue().getSubCommands());
+        }
+        return suggestionList;
+    }
+}

CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/command/BungeeMainCommand.java

@@ -0,0 +1,90 @@
+package eu.endermite.commandwhitelist.waterfall.command;
+
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import eu.endermite.commandwhitelist.common.commands.CWCommand;
+import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+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 BungeeMainCommand(String name) {
+        super(name);
+    }
+
+    public void execute(CommandSender sender, String[] args) {
+
+        String label = getName();
+        ConfigCache configCache = CommandWhitelistWaterfall.getConfigCache();
+        BungeeAudiences audiences = CommandWhitelistWaterfall.getAudiences();
+
+        if (args.length == 0) {
+            audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+            return;
+        }
+
+        try {
+            CWCommand.CommandType commandType = CWCommand.CommandType.valueOf(args[0].toUpperCase());
+            switch (commandType) {
+                case RELOAD:
+                    if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
+                        audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistWaterfall.getConfigCache().prefix + configCache.no_permission));
+                        return;
+                    }
+                    CommandWhitelistWaterfall.getPlugin().loadConfigAsync(sender);
+                    return;
+                case ADD:
+                    if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
+                        audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.no_permission));
+                        return;
+                    }
+                    if (args.length == 3) {
+                        if (CWCommand.addToWhitelist(configCache, args[2], args[1]))
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.added_to_whitelist));
+                        else
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.group_doesnt_exist));
+                    } else
+                        audiences.sender(sender).sendMessage(Component.text("/"+label+" add <group> <command>"));
+                    return;
+                case REMOVE:
+                    if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
+                        audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.no_permission));
+                        return;
+                    }
+                    if (args.length == 3) {
+                        if (CWCommand.removeFromWhitelist(configCache, args[2], args[1]))
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.removed_from_whitelist));
+                        else
+                            audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.group_doesnt_exist));
+                    } else
+                        audiences.sender(sender).sendMessage(Component.text("/"+label+" remove <group> <command>"));
+                    return;
+                case HELP:
+                default:
+                    audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+            }
+
+        } catch (IllegalArgumentException e) {
+            audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
+        }
+        return;
+    }
+
+    @Override
+    public Iterable<String> onTabComplete(CommandSender sender, String[] args) {
+        List<String> serverCommands = new ArrayList<>();
+        for (Map.Entry<String, Command> command : CommandWhitelistWaterfall.getPlugin().getProxy().getPluginManager().getCommands()) {
+            serverCommands.add(command.getValue().getName());
+        }
+        return CWCommand.commandSuggestions(CommandWhitelistWaterfall.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()),sender.hasPermission(CWPermission.ADMIN.permission()));
+    }
+}

CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/listeners/BungeeChatEventListener.java

@@ -0,0 +1,48 @@
+package eu.endermite.commandwhitelist.waterfall.listeners;
+
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.CommandUtil;
+import eu.endermite.commandwhitelist.common.ConfigCache;
+import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+import java.util.HashSet;
+
+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(CWPermission.BYPASS.permission())) return;
+
+        String command = event.getMessage().toLowerCase();
+        if (command.startsWith("/"))
+            command = command.substring(1);
+        ConfigCache configCache = CommandWhitelistWaterfall.getConfigCache();
+        BungeeAudiences audiences = CommandWhitelistWaterfall.getAudiences();
+
+        String label = CommandUtil.getCommandLabel(command);
+        HashSet<String> commands = CommandWhitelistWaterfall.getCommands(player);
+        if (!commands.contains(label)) {
+            event.setCancelled(true);
+            CommandWhitelistWaterfall.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.command_denied));
+            return;
+        }
+
+        HashSet<String> bannedSubCommands = CommandWhitelistWaterfall.getSuggestions(player);
+        for (String bannedSubCommand : bannedSubCommands) {
+            if (command.startsWith(bannedSubCommand)) {
+                event.setCancelled(true);
+                audiences.player(player).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.subcommand_denied));
+                return;
+            }
+        }
+    }
+}

CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/listeners/BungeeTabcompleteListener.java

@@ -0,0 +1,27 @@
+package eu.endermite.commandwhitelist.waterfall.listeners;
+
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.common.CommandUtil;
+import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+public class BungeeTabcompleteListener implements Listener {
+
+    @EventHandler
+    public void onTabcomplete(net.md_5.bungee.api.event.TabCompleteEvent event) {
+        if (!(event.getReceiver() instanceof ProxiedPlayer)) return;
+        ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+
+        CommandUtil.filterSuggestions(
+                event.getCursor(),
+                event.getSuggestions(),
+                CommandWhitelistWaterfall.getSuggestions(player)
+        );
+
+
+    }
+
+}

CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/listeners/WaterfallDefineCommandsListener.java

@@ -0,0 +1,29 @@
+package eu.endermite.commandwhitelist.waterfall.listeners;
+
+import eu.endermite.commandwhitelist.common.CWPermission;
+import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+import java.util.HashMap;
+
+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(CWPermission.BYPASS.permission()))
+                return;
+            HashMap<String, Command> commandHashMap = new HashMap<>();
+            CommandWhitelistWaterfall.getCommands(player).forEach(cmdName ->
+                    CommandWhitelistWaterfall.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));
+        }
+    }
+}

CommandWhitelistWaterfall/src/main/resources/bungee.yml

@@ -0,0 +1,4 @@
+name: CommandWhitelist
+version: ${project.version}
+main: eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall
+description: You decide what commands players can use or tab complete on your server!

pom.xml

@@ -4,10 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>eu.endermite</groupId>
+    <groupId>eu.endermite.commandwhitelist</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.2.0</version>
-    <packaging>jar</packaging>
+    <version>2.2.0</version>
+    <modules>
+        <module>CommandWhitelistCommon</module>
+        <module>CommandWhitelistBukkit</module>
+        <module>CommandWhitelistVelocity</module>
+        <module>CommandWhitelistWaterfall</module>
+    </modules>
+    <packaging>pom</packaging>
 
     <name>CommandWhitelist</name>
 
@@ -17,76 +23,25 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
     <repositories>
-        <repository>
-            <id>spigotmc-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>4.9.2</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.15-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.PaperMC</groupId>
-            <artifactId>Waterfall</artifactId>
-            <version>1.16</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/waterfall-366.jar</systemPath>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.1.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

readme.md

@@ -0,0 +1,32 @@
+Command  Whitelist is a plugin that allows you to control 
+precisely what commands players can see and use.
+
+[![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/youhavetrouble/commandwhitelist?style=flat-square)](https://www.codefactor.io/repository/github/youhavetrouble/commandwhitelist)
+[![GitHub all releases](https://img.shields.io/github/downloads/youhavetrouble/commandwhitelist/total?style=flat-square&label=direct%20release%20downloads)](https://github.com/YouHaveTrouble/CommandWhitelist/releases)
+[![Discord](https://img.shields.io/discord/821565102108573706?style=flat-square&color=%237289da&label=Discord)](https://discord.gg/j8KK5dGBps)
+[![Spiget Rating](https://img.shields.io/spiget/rating/81326?label=Spigot%20rating&style=flat-square)](https://www.spigotmc.org/resources/81326/)
+
+![bStats Servers](https://img.shields.io/bstats/servers/8705?label=Bukkit%20servers%20using%20CW&style=flat-square)
+![bStats Servers](https://img.shields.io/bstats/servers/8704?label=Proxy%20servers%20using%20CW&style=flat-square)
+
+<h3>Plugin Features</h3>
+<ul>
+<li>Lock selected commands behind permission
+<li>Overwrite default "no such command" message with your branding
+<li>Block tab completion</li>
+<li>Block command execution</li>
+<li>Block completion and execution of specified subcommands</li>
+</ul>
+
+<b>Compatible versions</b>: 1.13+
+
+<b>Compatible software</b>:
+- Bukkit-based servers (Spigot, Paper, Airplane, Purpur, etc)
+- Waterfall (NOT Bungeecord!)
+- Velocity
+
+[Download latest release](https://github.com/YouHaveTrouble/CommandWhitelist/releases/latest)
+
+Having some issues? Make sure to check out <a href="https://github.com/YouHaveTrouble/CommandWhitelist/wiki">Plugin Wiki</a>.
+
+Found a bug or you think plugin is missing an important feature? <a href="https://github.com/YouHaveTrouble/CommandWhitelist/issues">Create an issue</a>.

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

@@ -1,83 +0,0 @@
-package eu.endermite.commandwhitelist.bungee;
-
-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.spigot.CommandWhitelist;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.plugin.Plugin;
-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.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-
-public final class CommandWhitelistBungee extends Plugin {
-
-    private static CommandWhitelistBungee plugin;
-    private static BungeeConfigCache configCache;
-
-    @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.");
-        }
-        getProxy().getPluginManager().registerCommand(this, new BungeeMainCommand());
-
-    }
-
-    public static CommandWhitelistBungee getPlugin() {
-        return plugin;
-    }
-
-    public static BungeeConfigCache getConfigCache() {
-        return configCache;
-    }
-
-
-    public void loadConfig() {
-        try {
-            if (!getDataFolder().exists()) {
-                getDataFolder().mkdir();
-            }
-
-            File file = new File(getDataFolder(), "config.yml");
-
-            if (!file.exists()) {
-                file.createNewFile();
-                try (InputStream in = getResourceAsStream("bungeeconfig.yml");
-                     OutputStream out = new FileOutputStream(file)) {
-                    ByteStreams.copy(in, out);
-                }
-            }
-            final Configuration config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file);
-            ConfigurationProvider.getProvider(YamlConfiguration.class).save(config, new File(getDataFolder(), "config.yml"));
-            configCache = new BungeeConfigCache(config);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void loadConfigAsync(CommandSender sender) {
-        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

@@ -1,34 +0,0 @@
-package eu.endermite.commandwhitelist.bungee.command;
-
-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;
-
-
-public class BungeeMainCommand extends Command {
-    public BungeeMainCommand() {
-        super("bungeecommandwhitelist", "none", "bcw");
-
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (args.length > 0) {
-            if (args[0].equalsIgnoreCase("reload")) {
-                if (sender.hasPermission("commandwhitelist.reload")) {
-                    CommandWhitelistBungee.getPlugin().loadConfigAsync(sender);
-                } else {
-                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoPermission()));
-                }
-            } else {
-                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoSubCommand()));
-            }
-        } else {
-            sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&bCommand Whitelist by YouHaveTrouble"));
-            if (sender.hasPermission("commandwhitelist.reload")) {
-                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/bcw reload &b- Reload bungee plugin configuration"));
-            }
-        }
-    }
-}

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

@@ -1,38 +0,0 @@
-package eu.endermite.commandwhitelist.bungee.config;
-
-import net.md_5.bungee.config.Configuration;
-
-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;
-
-    public BungeeConfigCache(Configuration 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");
-
-        Collection<String> perms = config.getSection("commands").getKeys();
-        for (String s : perms) {
-            this.permList.put(s, config.getStringList("commands."+s));
-        }
-    }
-
-    public HashMap<String, List<String>> getPermList() {
-        return permList;
-    }
-
-    public String getPrefix() {return prefix;}
-    public String getCommandDenied() {return commandDenied;}
-    public String getNoPermission() {return noPermission;}
-    public String getNoSubCommand() {return  noSubCommand;}
-    public String getConfigReloaded() {return  configReloaded;}
-
-}

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

@@ -1,46 +0,0 @@
-package eu.endermite.commandwhitelist.bungee.listeners;
-
-import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import java.util.List;
-import java.util.Map;
-
-public class BungeeChatEventListener implements Listener {
-
-    @EventHandler
-    public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) {
-
-        if (!event.isCancelled() && event.getSender() instanceof ProxiedPlayer) {
-            ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-            if (event.isProxyCommand()) {
-                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())) {
-                        for (String comm : s.getValue()) {
-                            comm = comm.toLowerCase();
-                            if (command.equalsIgnoreCase("/"+comm)) {
-                                found = true;
-                                break;
-                            }
-                            else if (command.startsWith("/" + comm + " ")) {
-                                found = true;
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (!found) {
-                    event.setCancelled(true);
-                    player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied()));
-                }
-            }
-        }
-    }
-}

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

@@ -1,46 +0,0 @@
-package eu.endermite.commandwhitelist.bungee.listeners;
-
-import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class BungeeTabCompleteListener 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")) {
-                return;
-            }
-
-            List<String> commandList = new ArrayList<>();
-            for (Map.Entry<String, List<String>> entry : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
-                if (player.hasPermission("commandwhitelist.commands."+entry.getKey())) {
-                    commandList.addAll(entry.getValue());
-                }
-            }
-            HashMap<String, Command> commandHashMap = new HashMap<>();
-            for (String s : commandList) {
-                for (Map.Entry<String, Command> command : CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()) {
-                    if (s.equalsIgnoreCase(command.getValue().getName())) {
-                        commandHashMap.put(command.getKey(), command.getValue());
-                    }
-                }
-            }
-            event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd));
-        }
-
-
-        
-    }
-
-}

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

@@ -1,49 +0,0 @@
-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.PlayerCommandPreProcessListener;
-import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandSendListener;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class CommandWhitelist extends JavaPlugin {
-
-    private static CommandWhitelist commandWhitelist;
-    private static ConfigCache configCache;
-
-    @Override
-    public void onEnable() {
-
-        commandWhitelist = this;
-        reloadPluginConfig();
-
-        getServer().getPluginManager().registerEvents(new PlayerCommandPreProcessListener(), this);
-        getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
-        getCommand("commandwhitelist").setExecutor(new MainCommand());
-        getCommand("commandwhitelist").setTabCompleter(new MainCommand());
-
-    }
-
-    public void reloadPluginConfig() {
-        saveDefaultConfig();
-        reloadConfig();
-        configCache = new ConfigCache();
-    }
-
-    public void reloadPluginConfig(CommandSender sender) {
-        getServer().getScheduler().runTaskAsynchronously(this, () -> {
-            reloadPluginConfig();
-            for (Player p : Bukkit.getOnlinePlayers()) {
-                p.updateCommands();
-            }
-            sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getConfigReloaded()));
-        });
-    }
-
-    public static CommandWhitelist getPlugin() {return commandWhitelist;}
-    public static ConfigCache getConfigCache() {return configCache;}
-}

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

@@ -1,49 +0,0 @@
-package eu.endermite.commandwhitelist.spigot.command;
-
-import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MainCommand implements TabExecutor {
-
-    @Override
-    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 {
-                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoPermission()));
-                }
-            } else {
-                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoSubCommand()));
-            }
-        } else {
-            sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&bCommand Whitelist by YouHaveTrouble"));
-            if (sender.hasPermission("commandwhitelist.reload")) {
-                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/cw reload &b- Reload plugin configuration"));
-            }
-        }
-        return true;
-    }
-
-    @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")) {
-                list.add("reload");
-            }
-        }
-
-        return list;
-    }
-}

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

@@ -1,43 +0,0 @@
-package eu.endermite.commandwhitelist.spigot.config;
-
-import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
-import org.bukkit.configuration.Configuration;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-public class ConfigCache {
-
-    private HashMap<String, List<String>> permList = new HashMap<>();
-    private String prefix, commandDenied, noPermission, noSubCommand, configReloaded;
-
-    public ConfigCache() {
-
-        Configuration config = CommandWhitelist.getPlugin().getConfig();
-
-        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");
-
-        Set<String> perms = config.getConfigurationSection("commands").getKeys(false);
-        for (String s : perms) {
-            this.permList.put(s, config.getStringList("commands."+s));
-        }
-    }
-
-    public HashMap<String, List<String>> getPermList() {
-        return permList;
-    }
-
-    public List<String> getPerm(String s) {
-        return permList.get(s);
-    }
-    public String getPrefix() {return prefix;}
-    public String getCommandDenied() {return commandDenied;}
-    public String getNoPermission() {return noPermission;}
-    public String getNoSubCommand() {return  noSubCommand;}
-    public String getConfigReloaded() {return  configReloaded;}
-}

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

@@ -1,40 +0,0 @@
-package eu.endermite.commandwhitelist.spigot.listeners;
-
-import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
-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)
-    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())) {
-                for (String comm : s.getValue()) {
-                    comm = comm.toLowerCase();
-                    if (command.equalsIgnoreCase("/"+comm))
-                        return;
-                    else if (command.startsWith("/" + comm + " ")) {
-                        return;
-                    }
-                }
-            }
-        }
-        event.setCancelled(true);
-        player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getCommandDenied()));
-    }
-
-}

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

@@ -1,34 +0,0 @@
-package eu.endermite.commandwhitelist.spigot.listeners;
-
-import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import java.util.*;
-
-public class PlayerCommandSendListener implements Listener {
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
-        Player player = event.getPlayer();
-
-        if (player.hasPermission("commandwhitelist.bypass")) {
-            return;
-        }
-
-        List<String> commandList = new ArrayList<>();
-
-        for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
-                if (player.hasPermission("commandwhitelist.commands."+s.getKey())) {
-                    commandList.addAll(s.getValue());
-                }
-        }
-
-        event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
-
-    }
-
-
-
-}

src/main/resources/bungee.yml

@@ -1,4 +0,0 @@
-name: CommandWhitelistBungee
-version: ${project.version}
-main: eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee
-author: YouHaveTrouble

src/main/resources/bungeeconfig.yml

@@ -1,20 +0,0 @@
-# This is bungeecord version of the config.
-messages:
-  prefix: "CommandWhitelist > "
-  command-denied: "No such command."
-  no-permission: "&cYou don't have permission to do this."
-  no-such-subcommand: "&cNo subcommand by that name."
-  config-reloaded: "&eConfiguration reloaded."
-
-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:
-    - glist
-    - server
-  # commandwhitelist.commands.example
-  example:
-    - example

src/main/resources/config.yml

@@ -1,30 +0,0 @@
-messages:
-  prefix: "CommandWhitelist > "
-  command-denied: "No such command."
-  no-permission: "&cYou don't have permission to do this."
-  no-such-subcommand: "&cNo subcommand by that name."
-  config-reloaded: "&eConfiguration reloaded."
-
-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
-    - spawn
-    - bal
-    - balance
-    - baltop
-    - pay
-    - r
-    - msg
-    - tpa
-    - tpahere
-    - tpaccept
-    - tpdeny
-    - warp
-  # commandwhitelist.commands.example
-  example:
-    - example