version bump

fix tab complete with useProtocolLib

CommandWhitelistBukkit/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0</version>
     </parent>
 
     <artifactId>Bukkit</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Bukkit</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -34,7 +34,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -42,13 +42,17 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <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>
@@ -72,13 +76,17 @@
             <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>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -105,5 +113,11 @@
             <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

@@ -2,6 +2,8 @@ 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;
@@ -42,6 +44,7 @@ public class CommandWhitelistBukkit extends JavaPlugin {
             getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
         } else {
             PacketCommandPreProcessListener.protocol(this);
+            PacketCommandSendListener.protocol(this);
             getLogger().info(ChatColor.AQUA + "Using ProtocolLib for command filter!");
         }
         try {

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

@@ -1,4 +1,4 @@
-package eu.endermite.commandwhitelist.bukkit.listeners;
+package eu.endermite.commandwhitelist.bukkit.listeners.protocollib;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;

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()));
+            }
+        });
+    }
+
+}

CommandWhitelistCommon/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0</version>
     </parent>
 
     <artifactId>Common</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Common</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -43,7 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
                         </configuration>
                     </execution>
                 </executions>
@@ -66,6 +66,10 @@
             <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>
@@ -82,9 +86,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
+            <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -86,6 +86,7 @@ public class ConfigCache {
         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)) {

CommandWhitelistVelocity/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0</version>
     </parent>
 
     <artifactId>Velocity</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Velocity</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -43,7 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.parent.version}</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>

CommandWhitelistWaterfall/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0</version>
     </parent>
 
     <artifactId>Waterfall</artifactId>
     <packaging>jar</packaging>
-    <name>CommandWhitelist</name>
+    <name>CommandWhitelist-Waterfall</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -43,12 +43,16 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.artifactId}-${project.parent.version}</finalName>
+                            <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>
@@ -75,22 +79,23 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-api</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</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>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>

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

@@ -32,18 +32,21 @@ public final class CommandWhitelistWaterfall extends Plugin {
         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) {
-            getLogger().severe(ChatColor.DARK_RED+"Bungee command completion blocker requires Waterfall other Waterfall fork.");
+            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"));
 
-        Metrics metrics = new Metrics(this, 8704);
+
-        metrics.addCustomChart(new SimplePie("proxy", () -> "Bungee/Waterfall"));
     }
 
     public static CommandWhitelistWaterfall getPlugin() {

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite.commandwhitelist</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>2.1.1</version>
+    <version>2.2.0</version>
     <modules>
         <module>CommandWhitelistCommon</module>
         <module>CommandWhitelistBukkit</module>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.8.1</version>
+            <version>4.9.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>