Fix a few command issues (#151)

Signed-off-by: Lyfts <127234178+Lyfts@users.noreply.github.com>
GTNewHorizons · Dec 10, 2024 · 3780a4a · 3780a4a
1 parent 8c6e21b
commit 3780a4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/serverutils/lib/command/CmdTreeHelp.java b/src/main/java/serverutils/lib/command/CmdTreeHelp.java
@@ -1,13 +1,13 @@
 package serverutils.lib.command;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 import net.minecraft.command.CommandHelp;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.util.StatCollector;
 
 public class CmdTreeHelp extends CommandHelp {
 
@@ -32,10 +32,15 @@ protected List<ICommand> getSortedPossibleCommands(ICommandSender sender) {
             }
         }
 
-        Collections.sort(list);
+        list.sort(null);
         return list;
     }
 
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return StatCollector.translateToLocal(parent.getCommandUsage(sender)) + " help";
+    }
+
     @Override
     protected Map<String, ICommand> getCommands() {
         return parent.getCommandMap();

diff --git a/src/mixins/java/serverutils/mixins/early/minecraft/MixinCommandHandler.java b/src/mixins/java/serverutils/mixins/early/minecraft/MixinCommandHandler.java
@@ -1,5 +1,8 @@
 package serverutils.mixins.early.minecraft;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandHandler;
 import net.minecraft.command.ICommand;
@@ -31,6 +34,9 @@
 @Mixin(CommandHandler.class)
 public abstract class MixinCommandHandler {
 
+    @Unique
+    private static final Matcher PERMISSION_REPLACE_MATCHER = Pattern.compile("[^a-zA-Z0-9._]").matcher("");
+
     @ModifyExpressionValue(
             method = { "getPossibleCommands(Lnet/minecraft/command/ICommandSender;)Ljava/util/List;",
                     "executeCommand" },
@@ -58,7 +64,7 @@ public abstract class MixinCommandHandler {
         String node = (container == null ? Rank.NODE_COMMAND : (Rank.NODE_COMMAND + '.' + container.getModId())) + "."
                 + command.getCommandName();
         ICommandWithPermission cmd = (ICommandWithPermission) command;
-        cmd.serverutilities$setPermissionNode(node.toLowerCase());
+        cmd.serverutilities$setPermissionNode(PERMISSION_REPLACE_MATCHER.reset(node.toLowerCase()).replaceAll("_"));
         cmd.serverutilities$setModName(container == null ? "Minecraft" : container.getName());
         serverUtilities$registerPermissions(cmd);
     }