From ed3ab8d0949d89aaa346a6bb4b20af9c63e83cd5 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Mon, 16 Nov 2020 06:23:37 +0000 Subject: [PATCH] mixins: move menuaction print to after event (#2862) The event can modify the action, so we print what the action is after the event fires. --- .../net/runelite/mixins/RSClientMixin.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 c1352137d3..47e4e1afe2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1394,14 +1394,6 @@ public abstract class RSClientMixin implements RSClient target = target.substring(10); } - if (printMenuActions && client.getLogger().isDebugEnabled()) - { - client.getLogger().debug( - "|MenuAction|: MenuOption={} MenuTarget={} Id={} Opcode={} Param0={} Param1={} CanvasX={} CanvasY={} Authentic={}", - option, target, id, opcode, param0, param1, canvasX, canvasY, authentic - ); - } - /* Along the way, the RuneScape client may change a menuAction by incrementing it with 2000. * I have no idea why, but it does. Their code contains the same conditional statement. */ @@ -1429,6 +1421,16 @@ public abstract class RSClientMixin implements RSClient return; } + if (printMenuActions) + { + client.getLogger().info( + "|MenuAction|: MenuOption={} MenuTarget={} Id={} Opcode={} Param0={} Param1={} CanvasX={} CanvasY={} Authentic={}", + menuOptionClicked.getOption(), menuOptionClicked.getTarget(), menuOptionClicked.getIdentifier(), + menuOptionClicked.getOpcode(), menuOptionClicked.getParam0(), menuOptionClicked.getParam1(), + canvasX, canvasY, authentic + ); + } + copy$menuAction(menuOptionClicked.getParam0(), menuOptionClicked.getParam1(), menuOptionClicked.getOpcode(), menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), canvasX, canvasY); }