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

Client: menu changes (#1553)

Browse Source 
* Remove sortMenuEntries as it is called before it would be used anyway

* Modify the menuentries in MenuOpened rather than setting twice

* menus: Corp, Devtools, Friend notes/tags, Grand exchange

* menus: Manager, ground items
This commit is contained in:
Lucwousin
2019-09-05 23:42:43 +02:00
committed by GitHub
parent 5bbae89a70
commit 7d4eebd8bc
15 changed files with 177 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,47 +109,4 @@ public abstract class MenuMixin implements RSClient
}
}
}
@Inject
@Override
public void sortMenuEntries()
{
int count = getMenuOptionCount() - 1;
int[] menuOpcodes = getMenuOpcodes();
String[] menuTargetNames = getMenuTargets();
String[] menuActions = getMenuOptions();
int[] menuArguments0 = getMenuIdentifiers();
int[] menuArguments1 = getMenuArguments1();
int[] menuArguments2 = getMenuArguments2();
boolean[] menuShiftClick = getMenuForceLeftClick();
int tmp;
for (int i = 0; i < count; ++i)
{
if (menuOpcodes[i] < 1000 && menuOpcodes[i + 1] > 1000)
{
String var3 = menuTargetNames[i];
menuTargetNames[i] = menuTargetNames[i + 1];
menuTargetNames[i + 1] = var3;
String var4 = menuActions[i];
menuActions[i] = menuActions[i + 1];
menuActions[i + 1] = var4;
tmp = menuOpcodes[i];
menuOpcodes[i] = menuOpcodes[i + 1];
menuOpcodes[i + 1] = tmp;
tmp = menuArguments1[i];
menuArguments1[i] = menuArguments1[i + 1];
menuArguments1[i + 1] = tmp;
tmp = menuArguments2[i];
menuArguments2[i] = menuArguments2[i + 1];
menuArguments2[i + 1] = tmp;
tmp = menuArguments0[i];
menuArguments0[i] = menuArguments0[i + 1];
menuArguments0[i + 1] = tmp;
boolean var6 = menuShiftClick[i];
menuShiftClick[i] = menuShiftClick[i + 1];
menuShiftClick[i + 1] = var6;
}
}
}
}

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

@@ -1419,10 +1419,14 @@ public abstract class RSClientMixin implements RSClient
@MethodHook("openMenu")
public void menuOpened(int x, int y)
{
sortMenuEntries();
final MenuOpened event = new MenuOpened();
event.setMenuEntries(getMenuEntries());
callbacks.post(MenuOpened.class, event);
if (event.isModified())
{
setMenuEntries(event.getMenuEntries());
}
}
@Inject