Merge pull request #27 from XTerPL/XTer-4-1

fixed the SendChatEvent not triggering when using a registered command with arguments...

Author: TechStreetDev

src/main/java/io/github/techstreet/dfscript/mixin/player/MLocalPlayer.java

@@ -3,6 +3,7 @@
 import io.github.techstreet.dfscript.event.SendChatEvent;
 import io.github.techstreet.dfscript.event.TickEvent;
 import io.github.techstreet.dfscript.event.system.EventManager;
+import io.github.techstreet.dfscript.util.chat.ChatUtil;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
@@ -24,7 +25,7 @@ private void chat(String message, Text preview, CallbackInfo ci) {
         }
     }
 
-    @Inject(method = "sendCommand", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "sendCommand(Ljava/lang/String;)Z", at = @At("HEAD"), cancellable = true)
     private void command(String command, CallbackInfoReturnable<Boolean> ci) {
         SendChatEvent event = new SendChatEvent("/"+command);
         EventManager.getInstance().dispatch(event);
@@ -33,8 +34,8 @@ private void command(String command, CallbackInfoReturnable<Boolean> ci) {
         }
     }
 
-    @Inject(method = "sendCommandInternal", at = @At("HEAD"), cancellable = true)
-    private void commandInterval(String command, @Nullable Text preview, CallbackInfo ci) {
+    @Inject(method = "sendCommand(Ljava/lang/String;Lnet/minecraft/text/Text;)V", at = @At("HEAD"), cancellable = true)
+    private void command2(String command, Text preview, CallbackInfo ci) {
         SendChatEvent event = new SendChatEvent("/"+command);
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {

src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.java

@@ -1041,10 +1041,10 @@ public enum ScriptActionType {
                         }
                     }
 
-                    /*ClientPlayNetworkHandler nh = DFScript.MC.getNetworkHandler();
+                    ClientPlayNetworkHandler nh = DFScript.MC.getNetworkHandler();
                     if (nh != null) {
                         nh.onCommandTree(new CommandTreeS2CPacket(nh.getCommandDispatcher().getRoot()));
-                    }*/
+                    }
                 }
                 catch(Exception e){
                     ChatUtil.error("Cannot register command '" + cmd.asText() + "': " + e.getMessage());

src/main/resources/dfscript.mixins.json

@@ -17,5 +17,6 @@
   ],
   "injectors": {
     "defaultRequire": 1
-  }
+  },
+  "priority": 0
 }