From c6e6ea7c991d2af347eb73639c30c4fbe07cab0d Mon Sep 17 00:00:00 2001 From: Ganom Date: Thu, 9 Apr 2020 10:12:09 -0400 Subject: [PATCH] client: refactor a bit more, and add assertion. --- .../java/net/runelite/mixins/RSClientMixin.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index b3caf5c091..4dca478105 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1385,20 +1385,20 @@ public abstract class RSClientMixin implements RSClient } @Replace("menuAction") - static void rl$menuAction(int param0, int param1, int opcode, int id, String menuOption, String menuTarget, int canvasX, int canvasY) + static void rl$menuAction(int param0, int param1, int opcode, int id, String option, String target, int canvasX, int canvasY) { boolean authentic = true; - if (menuTarget != null && menuTarget.startsWith("!AUTHENTIC")) + if (target != null && target.startsWith("!AUTHENTIC")) { authentic = false; - menuTarget = menuTarget.substring(10); + target = target.substring(10); } if (printMenuActions && client.getLogger().isDebugEnabled()) { client.getLogger().debug( - "|MenuAction|: Param0={} Param1={} Opcode={} Id={} MenuOption={} MenuTarget={} CanvasX={} CanvasY={} Authentic={}", - param0, param1, opcode, id, menuOption, menuTarget, canvasX, canvasY, authentic + "|MenuAction|: MenuOption={} MenuTarget={} Id={} Opcode={} Param0={} Param1={} CanvasX={} CanvasY={} Authentic={}", + option, target, id, opcode, param0, param1, canvasX, canvasY, authentic ); } @@ -1411,8 +1411,8 @@ public abstract class RSClientMixin implements RSClient } final MenuOptionClicked menuOptionClicked = new MenuOptionClicked( - menuOption, - menuTarget, + option, + target, id, opcode, param0, @@ -1437,6 +1437,8 @@ public abstract class RSClientMixin implements RSClient @Inject public void invokeMenuAction(String option, String target, int identifier, int opcode, int param0, int param1) { + assert isClientThread(); + client.sendMenuAction(param0, param1, opcode, identifier, option, "!AUTHENTIC" + target, 658, 384); }