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

client: standardize menuAction namings. (#2023)

Browse Source 
* client: standardize menuAction namings.

* client: use standardized namings in MenuEntry

* client: use skitzos preferred naming scheme

* client: updated invoke naming scheme.
This commit is contained in:
Ganom
2019-11-13 11:19:11 -05:00
committed by Lucwousin
parent a7e6a9af8e
commit fd6a0e7f51
17 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1350,7 +1350,7 @@ public abstract class RSClientMixin implements RSClient
}
@Replace("menuAction")
static void rl$menuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7)
static void rl$menuAction(int param0, int param1, int opcode, int id, String menuOption, String menuTarget, int canvasX, int canvasY)
{
boolean authentic = true;
if (menuTarget != null && menuTarget.startsWith("!AUTHENTIC"))
@@ -1361,24 +1361,27 @@ public abstract class RSClientMixin implements RSClient
if (printMenuActions && client.getLogger().isDebugEnabled())
{
client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7, authentic);
client.getLogger().debug(
"|MenuAction|: Param0={} Param1={} Opcode={} Id={} MenuOption={} MenuTarget={} CanvasX={} CanvasY={} Authentic={}",
param0, param1, opcode, id, menuOption, menuTarget, 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.
*/
if (menuAction >= 2000)
if (opcode >= 2000)
{
menuAction -= 2000;
opcode -= 2000;
}
final MenuOptionClicked menuOptionClicked = new MenuOptionClicked(
menuOption,
menuTarget,
id,
menuAction,
actionParam,
widgetId,
opcode,
param0,
param1,
false,
authentic,
client.getMouseCurrentButton()
@@ -1392,14 +1395,14 @@ public abstract class RSClientMixin implements RSClient
}
rs$menuAction(menuOptionClicked.getParam0(), menuOptionClicked.getParam1(), menuOptionClicked.getOpcode(),
menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), var6, var7);
menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), canvasX, canvasY);
}
@Override
@Inject
public void invokeMenuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7)
public void invokeMenuAction(int param0, int param1, int opcode, int id, String menuOption, String menuTarget, int canvasX, int canvasY)
{
client.sendMenuAction(actionParam, widgetId, menuAction, id, menuOption, "!AUTHENTIC" + menuTarget, var6, var7);
client.sendMenuAction(param0, param1, opcode, id, menuOption, "!AUTHENTIC" + menuTarget, canvasX, canvasY);
}
@FieldHook("Login_username")