ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

mixins: move menuaction print to after event (#2862)

Browse Source 
The event can modify the action, so we print what the action is after the event fires.
This commit is contained in:
ThatGamerBlue
2020-11-16 06:23:37 +00:00
committed by GitHub
parent b80fa8535d
commit ed3ab8d094
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -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);
}