make minimessage resolve all tags

CommandWhitelistBukkit/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.4</version>
     </parent>
 
     <artifactId>Bukkit</artifactId>

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

@@ -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,10 +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;
+        if (player.hasPermission(CWPermission.BYPASS.permission())) return;
         String caseSensitiveLabel = CommandUtil.getCommandLabel(event.getMessage());
         String label = caseSensitiveLabel.toLowerCase();
-        event.setMessage(event.getMessage().replaceFirst(caseSensitiveLabel, label));
+
+        String fullCommand = event.getMessage().substring(label.length()+1);
+        fullCommand = "/"+label+fullCommand;
+
+        event.setMessage(fullCommand);
         BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
         ConfigCache config = CommandWhitelistBukkit.getConfigCache();
 

CommandWhitelistCommon/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.4</version>
     </parent>
 
     <artifactId>Common</artifactId>

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

@@ -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);

CommandWhitelistVelocity/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.4</version>
     </parent>
 
     <artifactId>Velocity</artifactId>

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

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

CommandWhitelistWaterfall/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.4</version>
     </parent>
 
     <artifactId>Waterfall</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite.commandwhitelist</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.4</version>
     <modules>
         <module>CommandWhitelistCommon</module>
         <module>CommandWhitelistBukkit</module>