client: Improve menumanager (#2026)

* make menumanager work with everything it didn't work with before

* rebuild left click before render instead of on client tick

* Remove useless checks which were breaking when dragging in bank

* Change rsclient line breaks (only 5th fucking time this pr dw)

* Rename arg1 & arg2 getters/fields to be more consistent
This commit is contained in:
Lucwousin
2019-11-13 17:13:24 +01:00
committed by GitHub
parent 33570fbe88
commit bfa3b22be6
10 changed files with 1232 additions and 1194 deletions

View File

@@ -361,7 +361,7 @@ public abstract class AbstractWorldMapData {
)
static void method325(int var0, int var1) {
MenuAction var2 = StudioGame.tempMenuAction;
GrandExchangeOfferOwnWorldComparator.menuAction(var2.argument1, var2.argument2, var2.opcode, var2.argument0, var2.action, var2.action, var0, var1);
GrandExchangeOfferOwnWorldComparator.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1);
StudioGame.tempMenuAction = null;
}

View File

@@ -17,8 +17,8 @@ public class MenuAction {
@ObfuscatedGetter(
intValue = -1613868885
)
@Export("argument1")
int argument1;
@Export("param0")
int param0;
@ObfuscatedName("t")
@Export("action")
String action;
@@ -26,8 +26,8 @@ public class MenuAction {
@ObfuscatedGetter(
intValue = -872703787
)
@Export("argument2")
int argument2;
@Export("param1")
int param1;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 553279575
@@ -38,8 +38,8 @@ public class MenuAction {
@ObfuscatedGetter(
intValue = -1804422619
)
@Export("argument0")
int argument0;
@Export("identifier")
int identifier;
MenuAction() {
}

View File

@@ -203,10 +203,10 @@ public class Script extends DualNode {
)
static void method2384(int var0) {
StudioGame.tempMenuAction = new MenuAction();
StudioGame.tempMenuAction.argument1 = Client.menuArguments1[var0];
StudioGame.tempMenuAction.argument2 = Client.menuArguments2[var0];
StudioGame.tempMenuAction.param0 = Client.menuArguments1[var0];
StudioGame.tempMenuAction.param1 = Client.menuArguments2[var0];
StudioGame.tempMenuAction.opcode = Client.menuOpcodes[var0];
StudioGame.tempMenuAction.argument0 = Client.menuIdentifiers[var0];
StudioGame.tempMenuAction.identifier = Client.menuIdentifiers[var0];
StudioGame.tempMenuAction.action = Client.menuActions[var0];
}
}