Merge branch 'DFOnline:1.20' into Functions

DFScripting · Dec 18, 2023 · b9bfef8 · b9bfef8
2 parents 214c55a + 064862c
commit b9bfef8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/io/github/techstreet/dfscript/mixin/game/MClientPlayNetworkHandler.java b/src/main/java/io/github/techstreet/dfscript/mixin/game/MClientPlayNetworkHandler.java
@@ -95,8 +95,8 @@ private void chat(String content, CallbackInfo ci) {
         }
     }
 
-    @Inject(method = "sendCommand(Ljava/lang/String;)Z", at = @At("HEAD"), cancellable = true)
-    private void command(String command, CallbackInfoReturnable<Boolean> ci) {
+    @Inject(method = "sendChatCommand", at = @At("HEAD"), cancellable = true)
+    private void command(String command, CallbackInfo ci) {
         if(command.startsWith("scripts")) return;
         SendChatEvent event = new SendChatEvent("/"+command);
         EventManager.getInstance().dispatch(event);

diff --git a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEventType.java b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEventType.java
@@ -14,7 +14,7 @@
 
 public enum ScriptEventType {
 
-    SEND_CHAT(SendChatEvent.class,"OnSendChat", "Executed when a player sends a chat message.", Items.BOOK),
+    SEND_CHAT(SendChatEvent.class,"OnSendChat", "Executed when a player sends a chat message or command.", Items.BOOK),
 
     KEY_PRESS(KeyPressEvent.class, "OnKeyPress", "Executed when a player presses a key.", Items.STONE_BUTTON),
 

diff --git a/src/main/java/io/github/techstreet/dfscript/script/menu/ScriptMenuButton.java b/src/main/java/io/github/techstreet/dfscript/script/menu/ScriptMenuButton.java
@@ -25,7 +25,7 @@ public String getIdentifier() {
     public boolean mouseClicked(double x, double y, int button) {
         if (getBounds().contains(x,y)) {
             DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK.value(), 1f,1f));
-            //script.invoke(new ScriptMenuClickButtonEvent(identifier));
+            script.invoke(new ScriptMenuClickButtonEvent(identifier));
             return true;
         }
         return false;