fix: not able to use commands

acrylic-style · acrylic-style · commit 0fecadd859ba · 2023-10-25T20:50:53.000+09:00
diff --git a/fabric-1.16/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinClientPlayerEntity.java b/fabric-1.16/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinClientPlayerEntity.java
@@ -13,9 +13,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayerEntity.class)
-public class MixinClientPlayNetworkHandler {
+public class MixinClientPlayerEntity {
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
     public void maybeCancel(String content, CallbackInfo ci) {
+        if (content.startsWith("/")) return;
         if (!ModConfig.chatWithoutCommand) {
             return;
         }
@@ -35,6 +36,6 @@ public void maybeCancel(String content, CallbackInfo ci) {
 
     @ModifyArg(method = "sendChatMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/c2s/play/ChatMessageC2SPacket;<init>(Ljava/lang/String;)V"))
     public String modifyMessageBodyArg(String string) {
-        return ModConfig.chatWithoutCommand ? string.substring(1) : string;
+        return ModConfig.chatWithoutCommand && !string.startsWith("/") ? string.substring(1) : string;
     }
 }
diff --git a/fabric-1.17/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinClientPlayerEntity.java b/fabric-1.17/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinClientPlayerEntity.java
@@ -13,9 +13,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayerEntity.class)
-public class MixinClientPlayNetworkHandler {
+public class MixinClientPlayerEntity {
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
     public void maybeCancel(String content, CallbackInfo ci) {
+        if (content.startsWith("/")) return;
         if (!ModConfig.chatWithoutCommand) {
             return;
         }
@@ -35,6 +36,6 @@ public void maybeCancel(String content, CallbackInfo ci) {
 
     @ModifyArg(method = "sendChatMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/c2s/play/ChatMessageC2SPacket;<init>(Ljava/lang/String;)V"))
     public String modifyMessageBodyArg(String string) {
-        return ModConfig.chatWithoutCommand ? string.substring(1) : string;
+        return ModConfig.chatWithoutCommand && !string.startsWith("/") ? string.substring(1) : string;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@`
`13`	`13`	`import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;`
`14`	`14`
`15`	`15`	`@Mixin(ClientPlayerEntity.class)`
`16`		`-public class MixinClientPlayNetworkHandler {`
	`16`	`+public class MixinClientPlayerEntity {`
`17`	`17`	`@Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)`
`18`	`18`	`public void maybeCancel(String content, CallbackInfo ci) {`
	`19`	`+ if (content.startsWith("/")) return;`
`19`	`20`	`if (!ModConfig.chatWithoutCommand) {`
`20`	`21`	`return;`
`21`	`22`	`}`
`@@ -35,6 +36,6 @@ public void maybeCancel(String content, CallbackInfo ci) {`
`35`	`36`
`36`	`37`	`@ModifyArg(method = "sendChatMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/c2s/play/ChatMessageC2SPacket;<init>(Ljava/lang/String;)V"))`
`37`	`38`	`public String modifyMessageBodyArg(String string) {`
`38`		`- return ModConfig.chatWithoutCommand ? string.substring(1) : string;`
	`39`	`+ return ModConfig.chatWithoutCommand && !string.startsWith("/") ? string.substring(1) : string;`
`39`	`40`	`}`
`40`	`41`	`}`