Conflicts resolving

- Added keybinding to open chat with `/moo ` pre-typed
- New sub-command: `/m cmd` to fix command conflicts with server-side commands with the same name `/m`
- Added `/<command with tab-completable username> say` (similar to `/moo say`)

2 files changed, 22 insertions, 3 deletions

diff --git a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
index 0c784eb..6be1a6c 100644
--- a/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
+++ b/src/main/java/de/cowtipper/cowlection/command/MooCommand.java
@@ -140,9 +140,18 @@ public class MooCommand extends CommandBase {
         else if (args[0].equalsIgnoreCase("help")) {
             sendCommandUsage(sender);
         }
+        // fix: run server-side command /m with optional arguments
+        else if (args[0].equalsIgnoreCase("cmd") || args[0].equalsIgnoreCase("command")) {
+            String cmdArgs = CommandBase.buildString(args, 1);
+            if (cmdArgs.length() > 0) {
+                cmdArgs = " " + cmdArgs;
+            }
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/m" + cmdArgs);
+        }
         // "catch-all" remaining sub-commands
         else {
-            main.getChatHelper().sendMessage(EnumChatFormatting.RED, "Command " + EnumChatFormatting.DARK_RED + "/" + getCommandName() + " " + args[0] + EnumChatFormatting.RED + " doesn't exist. Use " + EnumChatFormatting.DARK_RED + "/" + getCommandName() + " help " + EnumChatFormatting.RED + "to show command usage.");
+            main.getChatHelper().sendMessage(EnumChatFormatting.RED, "Command " + EnumChatFormatting.DARK_RED + "/" + getCommandName() + " " + args[0] + EnumChatFormatting.RED + " doesn't exist. Use " + EnumChatFormatting.DARK_RED + "/" + getCommandName() + " help " + EnumChatFormatting.RED + "to show command usage.\n"
+                    + EnumChatFormatting.RED + "Are you trying to use a server-side command " + EnumChatFormatting.DARK_RED + "/m" + EnumChatFormatting.RED + "? Use " + EnumChatFormatting.DARK_RED + "/m cmd [arguments] " + EnumChatFormatting.RED + "instead.");
         }
     }
 
diff --git a/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java b/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java
index 5edabe8..b873714 100644
--- a/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java
+++ b/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java
@@ -33,8 +33,18 @@ public class TabCompletableCommand extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-        // send client-command to server
-        Minecraft.getMinecraft().thePlayer.sendChatMessage("/" + getCommandName() + " " + CommandBase.buildString(args, 0));
+        String prefix;
+        String arguments;
+        if (args.length >= 1 && args[0].equalsIgnoreCase("say")) {
+            // work-around so you can still say '[commandName]' in chat without triggering the server-side command
+            prefix = "";
+            arguments = CommandBase.buildString(args, 1);
+        } else {
+            // send client-command to server
+            prefix = "/";
+            arguments = CommandBase.buildString(args, 0);
+        }
+        Minecraft.getMinecraft().thePlayer.sendChatMessage(prefix + getCommandName() + (!arguments.isEmpty() ? " " + arguments : ""));
     }
 
     @Override