From cf428682a2a6cc2fdcc3dbc06d03148a3b3988ff Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+chomens@users.noreply.github.com>
Date: Tue, 19 Aug 2025 20:23:10 +0700
Subject: [PATCH] fix: make `.say .something` actually make the player say
 `.something` in chat instead of running a command

---
 .../land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java   | 6 ++++++
 .../chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java   | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java
index 84976cc..2c428be 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java
@@ -2,6 +2,7 @@ package land.chipmunk.chipmunkmod.mixin;
 
 import com.google.gson.JsonObject;
 import land.chipmunk.chipmunkmod.ChipmunkMod;
+import land.chipmunk.chipmunkmod.command.CommandManager;
 import land.chipmunk.chipmunkmod.data.ChomeNSBotCommand;
 import land.chipmunk.chipmunkmod.modules.ChomeNSBotCommandSuggestions;
 import land.chipmunk.chipmunkmod.util.BotValidationUtilities;
@@ -38,6 +39,7 @@ public abstract class ChatScreenMixin {
 
     @Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)
     private void sendMessage (final String chatText, final boolean addToHistory, final CallbackInfo ci) {
+        final CommandManager commandManager = CommandManager.INSTANCE;
         final MinecraftClient client = MinecraftClient.getInstance();
 
         if (addToHistory) {
@@ -101,6 +103,10 @@ public abstract class ChatScreenMixin {
                 } catch (final Exception ignored) {
                 }
             }
+        } else if (chatText.startsWith(commandManager.prefix)) {
+            commandManager.executeCommand(chatText.substring(commandManager.prefix.length()));
+            ci.cancel();
+            return;
         }
 
         if (client.player == null) return;
diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java
index e6b3a0b..a29165a 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java
@@ -126,13 +126,6 @@ public abstract class ClientPlayNetworkHandlerMixin {
 
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
     private void sendChatMessage (final String content, final CallbackInfo ci) {
-        final CommandManager commandManager = CommandManager.INSTANCE;
-        if (content.startsWith(commandManager.prefix)) {
-            commandManager.executeCommand(content.substring(commandManager.prefix.length()));
-            ci.cancel();
-            return;
-        }
-
         if (Chat.NEXT_CHAT_PLAYER.get()) {
             Chat.NEXT_CHAT_PLAYER.set(false);
             return;