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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-08-05 00:10:59 +02:00
parent d8a1f3bbe2 912a68effa
commit c910bbb0ad
55 changed files with 997 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
View File

@@ -188,8 +188,8 @@ public abstract class MenuMixin implements RSClient
getMenuTargets()[i] = entry.getTarget();
getMenuIdentifiers()[i] = entry.getIdentifier();
getMenuOpcodes()[i] = entry.getOpcode();
getMenuArguments1()[i] = entry.getActionParam();
getMenuArguments2()[i] = entry.getActionParam1();
getMenuArguments1()[i] = entry.getParam0();
getMenuArguments2()[i] = entry.getParam1();
getMenuForceLeftClick()[i] = entry.isForceLeftClick();
}
@@ -215,7 +215,7 @@ public abstract class MenuMixin implements RSClient
tempMenuAction.setOption(entry.getOption());
tempMenuAction.setOpcode(entry.getOpcode());
tempMenuAction.setIdentifier(entry.getIdentifier());
tempMenuAction.setParam0(entry.getActionParam());
tempMenuAction.setParam1(entry.getActionParam1());
tempMenuAction.setParam0(entry.getParam0());
tempMenuAction.setParam1(entry.getParam1());
}
}

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

@@ -777,8 +777,8 @@ public abstract class RSClientMixin implements RSClient
entry.setTarget(menuTargets[i]);
entry.setIdentifier(menuIdentifiers[i]);
entry.setOpcode(menuTypes[i]);
entry.setActionParam(params0[i]);
entry.setActionParam1(params1[i]);
entry.setParam0(params0[i]);
entry.setParam1(params1[i]);
entry.setForceLeftClick(leftClick[i]);
}
return entries;
@@ -808,8 +808,8 @@ public abstract class RSClientMixin implements RSClient
menuTargets[count] = entry.getTarget();
menuIdentifiers[count] = entry.getIdentifier();
menuTypes[count] = entry.getOpcode();
params0[count] = entry.getActionParam();
params1[count] = entry.getActionParam1();
params0[count] = entry.getParam0();
params1[count] = entry.getParam1();
leftClick[count] = entry.isForceLeftClick();
++count;
}
@@ -855,8 +855,8 @@ public abstract class RSClientMixin implements RSClient
targets[oldCount] = event.getTarget();
identifiers[oldCount] = event.getIdentifier();
opcodes[oldCount] = event.getOpcode();
arguments1[oldCount] = event.getActionParam();
arguments2[oldCount] = event.getActionParam1();
arguments1[oldCount] = event.getParam0();
arguments2[oldCount] = event.getParam1();
forceLeftClick[oldCount] = event.isForceLeftClick();
}
}
@@ -1430,12 +1430,12 @@ public abstract class RSClientMixin implements RSClient
}
final MenuOptionClicked menuOptionClicked = new MenuOptionClicked();
menuOptionClicked.setActionParam(param0);
menuOptionClicked.setParam0(param0);
menuOptionClicked.setMenuOption(option);
menuOptionClicked.setMenuTarget(target);
menuOptionClicked.setMenuAction(MenuAction.of(opcode));
menuOptionClicked.setId(id);
menuOptionClicked.setWidgetId(param1);
menuOptionClicked.setParam1(param1);
menuOptionClicked.setSelectedItemIndex(client.getSelectedItemSlot());
client.getCallbacks().post(menuOptionClicked);