bump version

* Added CHAT_AND_ACTION to MessageType

* Implement command denied sounds

* Add feature to play sounds on denied commands

* Added comment to command_denied_sound

* Added comment to command_denied_sound

* Added Sounds and CHAT_AND_ACTION to Waterfall

* minor qol changes
do not show configs for features on platforms that don't benefit from them
make the new message type enum more clear

---------

Co-authored-by: YouHaveTrouble <youhavetrouble@youhavetrouble.me>

CommandWhitelistBukkit/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.10.0</version>
+        <version>2.13.0</version>
     </parent>
 
     <artifactId>Bukkit</artifactId>
@@ -15,7 +15,7 @@
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>youhavetrouble.me</url>
@@ -51,7 +51,7 @@
                                 </relocation>
                                 <relocation>
                                     <pattern>net.kyori</pattern>
-                                    <shadedPattern>eu.endermite</shadedPattern>
+                                    <shadedPattern>eu.endermite.net.kyori</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>
@@ -73,12 +73,12 @@
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
         <repository>
-            <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+            <id>sonatype-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
         </repository>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -86,19 +86,19 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <version>1.21.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.3</version>
+            <version>4.4.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.17.0</version>
+            <version>4.23.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -108,9 +108,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.comphenix.protocol</groupId>
+            <groupId>net.dmulloy2</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.1.0</version>
+            <version>5.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -119,11 +119,5 @@
             <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.mojang</groupId>
-            <artifactId>brigadier</artifactId>
-            <version>1.0.18</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>

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

@@ -20,7 +20,10 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 public class CommandWhitelistBukkit extends JavaPlugin {
@@ -69,9 +72,9 @@ public class CommandWhitelistBukkit extends JavaPlugin {
         File configFile = new File("plugins/CommandWhitelist/config.yml");
         if (configCache == null) {
             try {
-                configCache = new ConfigCache(configFile, true, getSLF4JLogger());
+                configCache = new ConfigCache(configFile, true, true, getSLF4JLogger());
             } catch (NoSuchMethodError e) {
-                configCache = new ConfigCache(configFile, true, null);
+                configCache = new ConfigCache(configFile, true, true, null);
             }
             return;
         }
@@ -85,7 +88,8 @@ public class CommandWhitelistBukkit extends JavaPlugin {
                 for (Player p : Bukkit.getOnlinePlayers()) {
                     p.updateCommands();
                 }
-            } catch (Exception ignored) {}
+            } catch (Exception ignored) {
+            }
             audiences.sender(sender).sendMessage(CWCommand.miniMessage.deserialize(configCache.prefix + configCache.config_reloaded));
         });
     }

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

@@ -13,12 +13,13 @@ 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 (!(event.getSender() instanceof Player player)) return;
         if (player.hasPermission(CWPermission.BYPASS.permission())) return;
         String buffer = event.getBuffer();
-        if ((buffer.split(" ").length == 1 && !buffer.endsWith(" ")) || !buffer.startsWith("/")) {
-            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented "+event.getSender().getName()+"'s tab completion (sus packet)");
+        int commandEnd = buffer.indexOf(' ');
+        if (commandEnd < 0 || buffer.charAt(0) != '/' || !CommandWhitelistBukkit.getCommands(player)
+                .contains(buffer.substring(1, commandEnd).toLowerCase())) {
+            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented " + event.getSender().getName() + "'s tab completion (sus packet)");
             event.setCancelled(true);
             return;
         }

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

@@ -5,7 +5,9 @@ import eu.endermite.commandwhitelist.common.CWPermission;
 import eu.endermite.commandwhitelist.common.CommandUtil;
 import eu.endermite.commandwhitelist.common.ConfigCache;
 import eu.endermite.commandwhitelist.common.commands.CWCommand;
+import net.kyori.adventure.key.Key;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -34,7 +36,30 @@ public class PlayerCommandPreProcessListener implements Listener {
                     messageWithoutSlash,
                     config.prefix + CommandWhitelistBukkit.getCommandDeniedMessage(label)
             );
+            switch (config.messageType) {
+                case CHAT:
                     audiences.player(player).sendMessage(message);
+                    break;
+                case ACTIONBAR:
+                    audiences.player(player).sendActionBar(message);
+                    break;
+                case CHAT_AND_ACTIONBAR:
+                    audiences.player(player).sendMessage(message);
+                    audiences.player(player).sendActionBar(message);
+                    break;
+
+            }
+            if(config.command_denied_sound_enabled) {
+                try {
+                    String soundKey = config.command_denied_sound_key;
+                    Key sound = Key.key(soundKey);
+                    float soundVolume = config.command_denied_sound_volume;
+                    float soundPitch = config.command_denied_sound_pitch;
+                    audiences.player(player).playSound(Sound.sound(sound, Sound.Source.UI, soundVolume, soundPitch));
+                } catch (Exception e) {
+                    config.warn("Invalid sound. unable to play sound!");
+                }
+            }
             return;
         }
 

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

@@ -13,12 +13,13 @@ 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 (!(event.getSender() instanceof Player player)) return;
         if (player.hasPermission(CWPermission.BYPASS.permission())) return;
         String buffer = event.getBuffer();
-        if ((buffer.split(" ").length == 1 && !buffer.endsWith(" ")) || !buffer.startsWith("/")) {
-            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented "+event.getSender().getName()+"'s tab completion (sus packet)");
+        int commandEnd = buffer.indexOf(' ');
+        if (commandEnd < 0 || buffer.charAt(0) != '/' || !CommandWhitelistBukkit.getCommands(player)
+                .contains(buffer.substring(1, commandEnd).toLowerCase())) {
+            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented " + event.getSender().getName() + "'s tab completion (sus packet)");
             event.setCancelled(true);
             return;
         }

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

@@ -18,6 +18,7 @@ import org.bukkit.plugin.Plugin;
 
 import java.util.HashSet;
 
+@Deprecated(forRemoval = true)
 public class PacketCommandPreProcessListener {
 
     public static void protocol(CommandWhitelistBukkit plugin) {

CommandWhitelistCommon/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.10.0</version>
+        <version>2.13.0</version>
     </parent>
 
     <artifactId>Common</artifactId>
@@ -15,7 +15,7 @@
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>youhavetrouble.me</url>
@@ -44,6 +44,12 @@
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <finalName>${project.name}-${project.parent.version}</finalName>
+                            <relocations>
+                                <relocation>
+                                    <pattern>net.kyori</pattern>
+                                    <shadedPattern>eu.endermite.net.kyori</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
@@ -60,7 +66,7 @@
     <repositories>
         <repository>
             <id>pluginwiki-repo</id>
-            <url>https://ci.pluginwiki.us/plugin/repository/everything/</url>
+            <url>https://repo.bsdevelopment.org/releases</url>
         </repository>
         <repository>
             <id>velocitypowered-repo</id>
@@ -68,7 +74,7 @@
         </repository>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public</url>
         </repository>
     </repositories>
 
@@ -76,7 +82,7 @@
         <dependency>
             <groupId>com.github.thatsmusic99</groupId>
             <artifactId>ConfigurationMaster-API</artifactId>
-            <version>v2.0.0-BETA-9</version>
+            <version>v2.0.0-rc.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -88,7 +94,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.17.0</version>
+            <version>4.23.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -2,6 +2,7 @@ package eu.endermite.commandwhitelist.common;
 
 import io.github.thatsmusic99.configurationmaster.api.ConfigFile;
 import io.github.thatsmusic99.configurationmaster.api.ConfigSection;
+import net.kyori.adventure.key.Key;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,16 +13,22 @@ public class ConfigCache {
     private final File configFile;
     private ConfigFile config;
     private final Object logger;
-    private final boolean canDoProtocolLib;
+    private final boolean canDoProtocolLib, supportsCommandDeniedMessage;
     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;
+            removed_from_whitelist, group_doesnt_exist, subcommand_denied, command_denied_sound_key;
     public boolean useProtocolLib = false;
+    public boolean command_denied_sound_enabled = false;
+    public float command_denied_sound_volume = 1.0f;
+    public float command_denied_sound_pitch = 1.0f;
+    public MessageType messageType = MessageType.CHAT;
     public boolean debug = false;
+    private final String default_command_denied_sound_key = "entity.villager.no";
 
-    public ConfigCache(File configFile, boolean canDoProtocolLib, Object logger) {
+    public ConfigCache(File configFile, boolean canDoProtocolLib, boolean supportsCommandDeniedMessage, Object logger) {
         this.configFile = configFile;
         this.canDoProtocolLib = canDoProtocolLib;
+        this.supportsCommandDeniedMessage = supportsCommandDeniedMessage;
         this.logger = logger;
 
         try {
@@ -42,8 +49,11 @@ public class ConfigCache {
         }
 
         config.addDefault("messages.prefix", "CommandWhitelist > ");
+        if (supportsCommandDeniedMessage) {
             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.");
@@ -56,6 +66,14 @@ public class ConfigCache {
         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 (supportsCommandDeniedMessage) {
+            config.addDefault("message_type", MessageType.CHAT.toString(), "Valid message types are CHAT and ACTIONBAR and CHAT_AND_ACTIONBAR.");
+            config.addDefault("command_denied_sound.enabled", false);
+            config.addDefault("command_denied_sound.key", "entity.villager.no");
+            config.addDefault("command_denied_sound.volume", 1.0f);
+            config.addDefault("command_denied_sound.pitch", 1.0f);
+        }
+
         if (config.isNew()) {
             List<String> exampleCommands = new ArrayList<>();
             exampleCommands.add("example");
@@ -92,8 +110,8 @@ public class ConfigCache {
         config.addDefault("groups.default", new CWGroup("default", defaultCommands, defaultSubcommands, defaultCustomCommandDeniedMessage).serialize());
 
         prefix = config.getString("messages.prefix");
-        command_denied = config.getString("messages.command_denied");
-        subcommand_denied = config.getString("messages.subcommand_denied");
+        command_denied = config.getString("messages.command_denied", "No such command.");
+        subcommand_denied = config.getString("messages.subcommand_denied", "You cannot use this subcommand");
         no_permission = config.getString("messages.no_permission");
         no_such_subcommand = config.getString("messages.no_such_subcommand");
         config_reloaded = config.getString("messages.config_reloaded");
@@ -101,13 +119,54 @@ public class ConfigCache {
         removed_from_whitelist = config.getString("messages.removed_from_whitelist");
         group_doesnt_exist = config.getString("messages.group_doesnt_exist");
         useProtocolLib = config.getBoolean("use_protocollib");
+        command_denied_sound_enabled =  config.getBoolean("command_denied_sound.enabled", false);
+        if(command_denied_sound_enabled) {
+            try {
+                String temp_command_denied_sound_key = config.getString("command_denied_sound.key");
+                if(temp_command_denied_sound_key == null) {
+                    warn("Invalid sound key. Using " + default_command_denied_sound_key);
+                    command_denied_sound_key = default_command_denied_sound_key;
+                } else {
+                    try {
+                    Key isSound = Key.key(temp_command_denied_sound_key);
+                    command_denied_sound_key = isSound.asString();
+                    } catch (Exception e) {
+                        warn("Invalid sound key. Using " + default_command_denied_sound_key);
+                        command_denied_sound_key = default_command_denied_sound_key;
+                    }
+                    command_denied_sound_key = command_denied_sound_key.toLowerCase(Locale.ENGLISH);
+                }
+                command_denied_sound_volume = config.getFloat("command_denied_sound.volume");
+                command_denied_sound_pitch = config.getFloat("command_denied_sound.pitch");
+            } catch (Exception e) {
+                warn("Invalid sound. Using default sound configurations.");
+                command_denied_sound_key = default_command_denied_sound_key;
+                command_denied_sound_volume = 1.0f;
+                command_denied_sound_pitch = 1.0f;
+            }
+        }
         debug = config.getBoolean("debug", false);
+        try {
+            String chatTypeId = config.getString("message_type");
+            if (chatTypeId == null) {
+                warn("Invalid message type. Using CHAT.");
+            } else {
+                messageType = MessageType.valueOf(chatTypeId.toUpperCase(Locale.ENGLISH));
+            }
+        } catch (IllegalArgumentException e) {
+            warn("Invalid message type. Using CHAT.");
+        }
 
         ConfigSection groupSection = config.getConfigSection("groups");
         for (String key : groupSection.getKeys(false)) {
             groupList.put(key, loadCWGroup(key, groupSection));
         }
 
+        if (canDoProtocolLib) {
+            warn("Protocollib support is deprecated and will be removed in future versions. If you have an actual" +
+                    " use case for it (aka plugin does not work without it), please reach out via discord (https://discord.youhavetrouble.me).");
+        }
+
         return saveConfig();
     }
 
@@ -164,7 +223,7 @@ public class ConfigCache {
         return groupList;
     }
 
-    private void warn(String log) {
+    public void warn(String log) {
         if (logger == null) {
             System.out.println("WARNING: "+log);
             return;

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

@@ -0,0 +1,7 @@
+package eu.endermite.commandwhitelist.common;
+
+public enum MessageType {
+
+    CHAT, ACTIONBAR, CHAT_AND_ACTIONBAR
+
+}

CommandWhitelistVelocity/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.10.0</version>
+        <version>2.13.0</version>
     </parent>
 
     <artifactId>Velocity</artifactId>
@@ -15,7 +15,7 @@
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>youhavetrouble.me</url>
@@ -76,7 +76,7 @@
     <repositories>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public</url>
         </repository>
         <repository>
             <id>minecraft-libraries</id>

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

@@ -52,7 +52,7 @@ public class CommandWhitelistVelocity {
 
     private void reloadConfig() {
         if (configCache == null)
-            configCache = new ConfigCache(folder.resolve("config.yml").toFile(), false, logger);
+            configCache = new ConfigCache(folder.resolve("config.yml").toFile(), false, false, logger);
         else
             configCache.reloadConfig();
     }

CommandWhitelistWaterfall/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.10.0</version>
+        <version>2.13.0</version>
     </parent>
 
     <artifactId>Waterfall</artifactId>
@@ -15,7 +15,7 @@
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>youhavetrouble.me</url>
@@ -74,7 +74,7 @@
         </repository>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public</url>
         </repository>
     </repositories>
 
@@ -94,13 +94,13 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.3.3</version>
+            <version>4.4.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.17.0</version>
+            <version>4.23.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -62,7 +62,7 @@ public final class CommandWhitelistWaterfall extends Plugin {
 
     public void loadConfig() {
         if (configCache == null)
-            configCache = new ConfigCache(new File(getDataFolder(), "config.yml"), false, getLogger());
+            configCache = new ConfigCache(new File(getDataFolder(), "config.yml"), false, true, getLogger());
         else
             configCache.reloadConfig();
     }

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

@@ -5,7 +5,9 @@ import eu.endermite.commandwhitelist.common.CommandUtil;
 import eu.endermite.commandwhitelist.common.ConfigCache;
 import eu.endermite.commandwhitelist.common.commands.CWCommand;
 import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
+import net.kyori.adventure.key.Key;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.text.Component;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ChatEvent;
@@ -38,7 +40,29 @@ public class BungeeChatEventListener implements Listener {
                     command,
                     configCache.prefix + CommandWhitelistWaterfall.getCommandDeniedMessage(label)
             );
+            switch (configCache.messageType) {
+                case CHAT:
                     audiences.player(player).sendMessage(message);
+                    break;
+                case ACTIONBAR:
+                    audiences.player(player).sendActionBar(message);
+                    break;
+                case CHAT_AND_ACTIONBAR:
+                    audiences.player(player).sendMessage(message);
+                    audiences.player(player).sendActionBar(message);
+                    break;
+            }
+            if(configCache.command_denied_sound_enabled) {
+                try {
+                    String soundKey = configCache.command_denied_sound_key;
+                    Key sound = Key.key(soundKey);
+                    float soundVolume = configCache.command_denied_sound_volume;
+                    float soundPitch = configCache.command_denied_sound_pitch;
+                    audiences.player(player).playSound(Sound.sound(sound, Sound.Source.UI, soundVolume, soundPitch));
+                } catch (Exception e) {
+                    configCache.warn("Invalid sound. unable to play sound!");
+                }
+            }
             return;
         }
 

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

@@ -7,19 +7,35 @@ 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;
+
 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 (event.getSuggestions().isEmpty()) return;
+        if (!(event.getSender() instanceof ProxiedPlayer)) return;
+        ProxiedPlayer player = (ProxiedPlayer) event.getSender();
         if (player.hasPermission(CWPermission.BYPASS.permission())) return;
-        CommandUtil.filterSuggestions(
+
+        String cursor = event.getCursor();
+        int commandEnd = cursor.indexOf(' ');
+        if (commandEnd >= 0 && cursor.charAt(0) == '/') {
+            String command = cursor.substring(1, commandEnd).toLowerCase();
+            if (CommandWhitelistWaterfall.getPlugin().getProxy().getPluginManager().isExecutableCommand(command, player)
+                    && !CommandWhitelistWaterfall.getCommands(player).contains(command)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        if (event.getSuggestions().isEmpty()) return;
+
+        List<String> suggestions = CommandUtil.filterSuggestions(
                 event.getCursor(),
                 event.getSuggestions(),
                 CommandWhitelistWaterfall.getSuggestions(player)
         );
+        event.getSuggestions().clear();
+        event.getSuggestions().addAll(suggestions);
     }
 
 }

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite.commandwhitelist</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>2.10.0</version>
+    <version>2.13.0</version>
     <modules>
         <module>CommandWhitelistCommon</module>
         <module>CommandWhitelistBukkit</module>
@@ -19,7 +19,7 @@
 
     <description>Control what commands players can use</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -54,6 +54,12 @@
                                     </manifestEntries>
                                 </transformer>
                             </transformers>
+                            <relocations>
+                                <relocation>
+                                    <pattern>net.kyori</pattern>
+                                    <shadedPattern>eu.endermite.net.kyori</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
@@ -72,13 +78,17 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.17.0</version>
+            <version>4.23.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

readme.md

@@ -13,6 +13,7 @@ precisely what commands players can see and use.
 <ul>
 <li>Lock selected commands behind permission
 <li>Overwrite default "no such command" message with your branding
+<li>Play configurable sounds when a command is denied</li>
 <li>Block tab completion</li>
 <li>Block command execution</li>
 <li>Block completion and execution of specified subcommands</li>