bump version

make bukkit module folia compatible
thanks to @Aitooor for figuring out what needed to be changed
2026-05-12 06:26:57 +00:00 · 2023-04-26 23:23:07 +02:00 · 2023-04-26 23:20:52 +02:00 · 2023-04-26 23:15:14 +02:00 · 2022-12-29 21:56:35 +01:00 · 2022-12-29 21:54:50 +01:00
16 changed files with 54 additions and 93 deletions
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.endermite.commandwhitelist</groupId>
        <artifactId>CommandWhitelist</artifactId>
-        <version>2.4.0</version>
+        <version>2.6.0</version>
    </parent>

    <artifactId>Bukkit</artifactId>
@@ -86,19 +86,19 @@
        <dependency>
            <groupId>io.papermc.paper</groupId>
            <artifactId>paper-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.19-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.1.0</version>
+            <version>4.1.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.10.1</version>
+            <version>4.11.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -110,7 +110,7 @@
        <dependency>
            <groupId>com.comphenix.protocol</groupId>
            <artifactId>ProtocolLib</artifactId>
-            <version>4.6.0</version>
+            <version>5.0.0-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -6,14 +6,12 @@ import eu.endermite.commandwhitelist.bukkit.listeners.PlayerCommandPreProcessLis
 import eu.endermite.commandwhitelist.bukkit.listeners.PlayerCommandSendListener;
 import eu.endermite.commandwhitelist.bukkit.listeners.TabCompleteBlockerListener;
 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 eu.endermite.commandwhitelist.common.commands.CWCommand;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 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;
@@ -23,6 +21,7 @@ import org.bukkit.plugin.java.JavaPlugin;

 import java.io.File;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;

 public class CommandWhitelistBukkit extends JavaPlugin {

@@ -42,11 +41,10 @@ public class CommandWhitelistBukkit extends JavaPlugin {

        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!");
+            getLogger().warning("Using ProtocolLib for command filter!");
+            getLogger().warning("Please make sure you actually need this. This is not a \"better way to do it\".");
        }
        try {
            // Use paper's async tab completions if possible
@@ -55,6 +53,7 @@ public class CommandWhitelistBukkit extends JavaPlugin {
        } catch (ClassNotFoundException ignored) {
        }
        getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
+        getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);

        PluginCommand command = getCommand("commandwhitelist");
        if (command != null) {
@@ -74,13 +73,13 @@ public class CommandWhitelistBukkit extends JavaPlugin {
            } catch (NoSuchMethodError e) {
                configCache = new ConfigCache(configFile, true, null);
            }
+            return;
        }
-        else
        configCache.reloadConfig();
    }

    public void reloadPluginConfig(CommandSender sender) {
-        getServer().getScheduler().runTaskAsynchronously(this, () -> {
+        CompletableFuture.runAsync(() -> {
            reloadPluginConfig();
            try {
                for (Player p : Bukkit.getOnlinePlayers()) {
@@ -66,7 +66,7 @@ public class BukkitCommandExecutor implements TabExecutor {
                        return true;
                    }
                    audiences.sender(sender).sendMessage(Component.text("Dumping all available commands to a file..."));
-                    if (CommandUtil.dumpAllBukkitCommands(CommandWhitelistBukkit.getServerCommands(), new File("plugins/CommandWhitelist/config.yml"))) {
+                    if (CommandUtil.dumpAllBukkitCommands(CommandWhitelistBukkit.getServerCommands(), new File("plugins/CommandWhitelist/command_dump.yml"))) {
                        audiences.sender(sender).sendMessage(Component.text("Commands dumped to command_dump.yml"));
                    } else {
                        audiences.sender(sender).sendMessage(Component.text("Failed to save the file."));
@@ -9,7 +9,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

-
 public class AsyncTabCompleteBlockerListener implements Listener {

    @EventHandler(priority = EventPriority.HIGHEST)
@@ -18,8 +17,14 @@ public class AsyncTabCompleteBlockerListener implements Listener {
        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;
+        if ((buffer.split(" ").length == 1 && !buffer.endsWith(" ")) || !buffer.startsWith("/")) {
+            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented "+event.getSender().getName()+"'s tab completion (sus packet)");
+            event.setCancelled(true);
+            return;
+        }
+        if (event.getCompletions().isEmpty()) {
+            return;
+        }
        event.setCompletions(CommandUtil.filterSuggestions(buffer, event.getCompletions(), CommandWhitelistBukkit.getSuggestions(player)));
    }

@@ -1,6 +1,7 @@
 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 eu.endermite.commandwhitelist.common.ConfigCache;
 import eu.endermite.commandwhitelist.common.commands.CWCommand;
@@ -16,8 +17,14 @@ 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());
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
+        String caseSensitiveLabel = CommandUtil.getCommandLabel(event.getMessage());
+        String label = caseSensitiveLabel.toLowerCase();
+
+        String fullCommand = event.getMessage().substring(label.length()+1);
+        fullCommand = "/"+label+fullCommand;
+
+        event.setMessage(fullCommand);
        BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
        ConfigCache config = CommandWhitelistBukkit.getConfigCache();

@@ -17,13 +17,12 @@ public class TabCompleteBlockerListener implements Listener {
        Player player = (Player) event.getSender();
        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
        String buffer = event.getBuffer();
-        if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) {
-            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented "+event.getSender().getName()+"'s tab completion (/[tab] packet)");
+        if ((buffer.split(" ").length == 1 && !buffer.endsWith(" ")) || !buffer.startsWith("/")) {
+            CommandWhitelistBukkit.getConfigCache().debug("Actively prevented "+event.getSender().getName()+"'s tab completion (sus packet)");
            event.setCancelled(true);
            return;
        }
        if (event.getCompletions().isEmpty()) {
-            CommandWhitelistBukkit.getConfigCache().debug("Tab completion not provided");
            return;
        }
        event.setCompletions(
@@ -34,9 +34,11 @@ public class PacketCommandPreProcessListener {
                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());
+                String caseSensitiveLabel = CommandUtil.getCommandLabel(string);
+                String label = caseSensitiveLabel.toLowerCase();
+                packet.getStrings().write(0, string.replaceFirst(caseSensitiveLabel, label));
+
                HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
                BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
                if (!commands.contains(label)) {
@@ -1,40 +0,0 @@
-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 (event.isPlayerTemporary()) return;
-                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()));
-            }
-        });
-    }
-
-}
@@ -5,6 +5,7 @@ api-version: 1.13
 main: eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit
 authors: [YouHaveTrouble]
 website: youhavetrouble.me
+folia-supported: true
 softdepend:
  - ProtocolLib
 description: Control what commands players can use
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.endermite.commandwhitelist</groupId>
        <artifactId>CommandWhitelist</artifactId>
-        <version>2.4.0</version>
+        <version>2.6.0</version>
    </parent>

    <artifactId>Common</artifactId>
@@ -82,19 +82,19 @@
        <dependency>
            <groupId>com.velocitypowered</groupId>
            <artifactId>velocity-api</artifactId>
-            <version>1.1.0</version>
+            <version>3.1.2-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.10.1</version>
+            <version>4.13.1</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>io.papermc.paper</groupId>
            <artifactId>paper-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.19-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -5,28 +5,13 @@ 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 net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

 public class CWCommand {

-    public static MiniMessage miniMessage = MiniMessage.builder().tags(
-                    TagResolver.builder()
-                            .resolver(StandardTags.color())
-                            .resolver(StandardTags.decorations())
-                            .resolver(StandardTags.gradient())
-                            .resolver(StandardTags.font())
-                            .resolver(StandardTags.reset())
-                            .resolver(StandardTags.rainbow())
-                            .resolver(StandardTags.translatable())
-                            .resolver(StandardTags.newline())
-                            .resolver(StandardTags.clickEvent())
-                            .resolver(StandardTags.keybind())
-                            .build()
-            ).build();
+    public static MiniMessage miniMessage = MiniMessage.miniMessage();

    public static boolean addToWhitelist(ConfigCache configCache, String command, String group) {
        CWGroup cwGroup = configCache.getGroupList().get(group);
@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.endermite.commandwhitelist</groupId>
        <artifactId>CommandWhitelist</artifactId>
-        <version>2.4.0</version>
+        <version>2.6.0</version>
    </parent>

    <artifactId>Velocity</artifactId>
@@ -11,6 +11,7 @@ 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.CommandUtil;
 import eu.endermite.commandwhitelist.common.ConfigCache;
 import eu.endermite.commandwhitelist.common.commands.CWCommand;
 import eu.endermite.commandwhitelist.velocity.command.VelocityMainCommand;
@@ -87,10 +88,12 @@ public class CommandWhitelistVelocity {

        if (player.hasPermission(CWPermission.BYPASS.permission())) return;

+        // Workaround for velocity executing "/ command" as valid command
+        String command = event.getCommand().trim();
+
        HashSet<String> allowedCommands = CommandWhitelistVelocity.getCommands(player);
-        String command = event.getCommand().split(" ")[0];
-        if (server.getCommandManager().hasCommand(command)
-                && !allowedCommands.contains(command))
+        String label = CommandUtil.getCommandLabel(command);
+        if (server.getCommandManager().hasCommand(label) && !allowedCommands.contains(label))
            event.setResult(CommandExecuteEvent.CommandResult.forwardToServer());
    }

@@ -6,7 +6,7 @@
    <parent>
        <groupId>eu.endermite.commandwhitelist</groupId>
        <artifactId>CommandWhitelist</artifactId>
-        <version>2.4.0</version>
+        <version>2.6.0</version>
    </parent>

    <artifactId>Waterfall</artifactId>
@@ -75,7 +75,7 @@ public class BungeeMainCommand extends Command implements TabExecutor {
                        return;
                    }
                    audiences.sender(sender).sendMessage(Component.text("Dumping all available commands to a file..."));
-                    if (CommandUtil.dumpAllBukkitCommands(CommandWhitelistWaterfall.getServerCommands(), new File("plugins/CommandWhitelist/config.yml"))) {
+                    if (CommandUtil.dumpAllBukkitCommands(CommandWhitelistWaterfall.getServerCommands(), new File("plugins/CommandWhitelist/command_dump.yml"))) {
                        audiences.sender(sender).sendMessage(Component.text("Commands dumped to command_dump.yml"));
                    } else {
                        audiences.sender(sender).sendMessage(Component.text("Failed to save the file."));
@@ -6,7 +6,7 @@

    <groupId>eu.endermite.commandwhitelist</groupId>
    <artifactId>CommandWhitelist</artifactId>
-    <version>2.4.0</version>
+    <version>2.6.0</version>
    <modules>
        <module>CommandWhitelistCommon</module>
        <module>CommandWhitelistBukkit</module>
@@ -46,7 +46,7 @@
                        </goals>
                        <configuration>
                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <finalName>${project.name}-${project.parent.version}</finalName>
+                            <finalName>${project.name}-${project.version}</finalName>
                        </configuration>
                    </execution>
                </executions>
@@ -71,7 +71,7 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-api</artifactId>
-            <version>4.10.1</version>
+            <version>4.11.0</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
Author	SHA1	Message	Date
YouHaveTrouble	e80629d708	bump version	2023-04-26 23:23:07 +02:00
YouHaveTrouble	f41bfa7cd1	make bukkit module folia compatible thanks to @Aitooor for figuring out what needed to be changed	2023-04-26 23:20:52 +02:00
YouHaveTrouble	5af0cdef84	update depends	2023-04-26 23:15:14 +02:00
YouHaveTrouble	e232953f11	bump version	2022-12-29 21:56:35 +01:00
YouHaveTrouble	e8b284db69	do not complete from legacy tab complete packet	2022-12-29 21:54:50 +01:00
YouHaveTrouble	ed1024c9e7	make minimessage resolve all tags	2022-12-20 19:04:22 +01:00
YouHaveTrouble	153ad5f983	fix errors when using regex expressions in executing command	2022-10-08 20:12:08 +02:00
YouHaveTrouble	9e5b5b5fc7	fix velocity weird command handling	2022-09-28 19:24:18 +02:00
YouHaveTrouble	67ca2c2458	lowercase command label	2022-09-28 13:33:03 +02:00
YouHaveTrouble	99f7c245da	bump version	2022-07-31 15:59:16 +02:00
YouHaveTrouble	cd4c41f1f2	make protocollib message a warning so it maybe catches more eyes	2022-07-31 15:59:05 +02:00
YouHaveTrouble	8a86568ce9	drop packet level command send event	2022-07-31 15:47:56 +02:00
YouHaveTrouble	b08234d268	update depends	2022-07-31 15:47:04 +02:00
YouHaveTrouble	2c7a089fae	bump version	2022-05-01 15:22:00 +02:00
YouHaveTrouble	41ff6d9d3e	don't replace config. whops	2022-05-01 15:20:00 +02:00