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

rs-client: refactoring (#1344)

Browse Source 
* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
runescape-client/src/main/java/class2.java
View File

@@ -49,7 +49,8 @@ final class class2 implements class0 {
signature = "(III)I",
garbageValue = "-1315693887"
)
static int method27(int var0, int var1) {
@Export("ItemContainer_getCount")
static int ItemContainer_getCount(int var0, int var1) {
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var2 == null) {
return 0;
@@ -99,44 +100,37 @@ final class class2 implements class0 {
int var13;
int var14;
int var15;
int var17;
int var18;
if (var9.type == 2) {
var12 = var2;
var13 = var3;
var14 = var4;
var15 = var5;
} else {
int var16;
if (var9.type == 9) {
var16 = var10;
var17 = var11;
var18 = var10 + var9.width;
int var19 = var11 + var9.height;
if (var18 < var10) {
var16 = var18;
var18 = var10;
}
if (var19 < var11) {
var17 = var19;
var19 = var11;
}
++var18;
++var19;
var12 = var16 > var2 ? var16 : var2;
var13 = var17 > var3 ? var17 : var3;
var14 = var18 < var4 ? var18 : var4;
var15 = var19 < var5 ? var19 : var5;
} else {
var16 = var10 + var9.width;
var17 = var11 + var9.height;
var12 = var10 > var2 ? var10 : var2;
var13 = var11 > var3 ? var11 : var3;
var14 = var16 < var4 ? var16 : var4;
var15 = var17 < var5 ? var17 : var5;
} else if (var9.type == 9) {
int var16 = var10;
int var17 = var11;
int var18 = var10 + var9.width;
int var19 = var11 + var9.height;
if (var18++ < var10) {
var16 = var18;
var18 = var10;
}
if (var19++ < var11) {
var17 = var19;
var19 = var11;
}
var12 = var16 > var2 ? var16 : var2;
var13 = var17 > var3 ? var17 : var3;
var14 = var18 < var4 ? var18 : var4;
var15 = var19 < var5 ? var19 : var5;
} else {
int var16 = var10 + var9.width;
int var17 = var11 + var9.height;
var12 = var10 > var2 ? var10 : var2;
var13 = var11 > var3 ? var11 : var3;
var14 = var16 < var4 ? var16 : var4;
var15 = var17 < var5 ? var17 : var5;
}
if (var9 == Client.clickedWidget) {
@@ -169,10 +163,9 @@ final class class2 implements class0 {
continue;
}
if (var9.isIf3) {
ScriptEvent var26;
if (var9.noClickThrough) {
if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
for (ScriptEvent var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
if (var26.boolean1) {
var26.remove();
var26.widget.containsMouse = false;
@@ -185,11 +178,11 @@ final class class2 implements class0 {
}
if (!Client.isMenuOpen) {
GraphicsObject.resetMenuEntries();
GraphicsObject.addCancelMenuEntry();
}
}
} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
for (ScriptEvent var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
if (var26.boolean1 && var26.widget.onScroll == var26.args) {
var26.remove();
}
@@ -197,8 +190,8 @@ final class class2 implements class0 {
}
}
var17 = MouseHandler.MouseHandler_x;
var18 = MouseHandler.MouseHandler_y;
int var17 = MouseHandler.MouseHandler_x;
int var18 = MouseHandler.MouseHandler_y;
if (MouseHandler.MouseHandler_lastButton != 0) {
var17 = MouseHandler.MouseHandler_lastPressedX;
var18 = MouseHandler.MouseHandler_lastPressedY;
@@ -227,14 +220,12 @@ final class class2 implements class0 {
}
}
boolean var21;
int var23;
if (var32) {
for (int var20 = 0; var20 < var9.field2650.length; ++var20) {
var21 = false;
boolean var21 = false;
boolean var22 = false;
if (!var21 && var9.field2650[var20] != null) {
for (var23 = 0; var23 < var9.field2650[var20].length; ++var23) {
for (int var23 = 0; var23 < var9.field2650[var20].length; ++var23) {
boolean var24 = false;
if (var9.field2578 != null) {
var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2650[var20][var23]];
@@ -259,7 +250,7 @@ final class class2 implements class0 {
if (var20 < 10) {
Messages.method2163(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
} else if (var20 == 10) {
WorldMapID.method542();
WorldMapID.Widget_runOnTargetLeave();
TileItem.method2053(var9.id, var9.childIndex, HealthBar.method1957(class268.getWidgetClickMask(var9)), var9.itemId);
Client.selectedSpellActionName = FontName.method5318(var9);
if (Client.selectedSpellActionName == null) {
@@ -269,7 +260,7 @@ final class class2 implements class0 {
Client.selectedSpellName = var9.dataText + ClientPreferences.colorStartTag(0xffffff);
}
var23 = var9.field2641[var20];
int var23 = var9.field2641[var20];
if (var9.field2578 == null) {
var9.field2578 = new int[var9.field2650.length];
}
@@ -307,7 +298,7 @@ final class class2 implements class0 {
var34 = true;
}
var21 = false;
boolean var21 = false;
if ((MouseHandler.MouseHandler_lastButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
var21 = true;
}
@@ -331,9 +322,8 @@ final class class2 implements class0 {
}
if (var9.hasListener) {
ScriptEvent var29;
if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseY = Client.mouseWheelRotation;
@@ -350,7 +340,7 @@ final class class2 implements class0 {
if (!var9.isClicked && var21) {
var9.isClicked = true;
if (var9.onClick != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
@@ -361,7 +351,7 @@ final class class2 implements class0 {
}
if (var9.isClicked && var34 && var9.onClickRepeat != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_x - var10;
@@ -373,7 +363,7 @@ final class class2 implements class0 {
if (var9.isClicked && !var34) {
var9.isClicked = false;
if (var9.onRelease != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_x - var10;
@@ -384,7 +374,7 @@ final class class2 implements class0 {
}
if (var34 && var9.onHold != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_x - var10;
@@ -396,7 +386,7 @@ final class class2 implements class0 {
if (!var9.containsMouse && var33) {
var9.containsMouse = true;
if (var9.onMouseOver != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_x - var10;
@@ -407,7 +397,7 @@ final class class2 implements class0 {
}
if (var9.containsMouse && var33 && var9.onMouseRepeat != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_x - var10;
@@ -419,7 +409,7 @@ final class class2 implements class0 {
if (var9.containsMouse && !var33) {
var9.containsMouse = false;
if (var9.onMouseLeave != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.boolean1 = true;
var29.widget = var9;
var29.mouseX = MouseHandler.MouseHandler_x - var10;
@@ -430,24 +420,21 @@ final class class2 implements class0 {
}
if (var9.onTimer != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onTimer;
Client.field852.addFirst(var29);
}
ScriptEvent var31;
int var35;
int var36;
if (var9.onVarTransmit != null && Client.field806 > var9.field2592) {
if (var9.varTransmitTriggers != null && Client.field806 - var9.field2592 <= 32) {
label865:
for (var35 = var9.field2592; var35 < Client.field806; ++var35) {
var23 = Client.field863[var35 & 31];
for (int var35 = var9.field2592; var35 < Client.field806; ++var35) {
int var23 = Client.field863[var35 & 31];
for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
for (int var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
if (var23 == var9.varTransmitTriggers[var36]) {
var31 = new ScriptEvent();
ScriptEvent var31 = new ScriptEvent();
var31.widget = var9;
var31.args = var9.onVarTransmit;
Client.scriptEvents.addFirst(var31);
@@ -456,7 +443,7 @@ final class class2 implements class0 {
}
}
} else {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onVarTransmit;
Client.scriptEvents.addFirst(var29);
@@ -468,12 +455,12 @@ final class class2 implements class0 {
if (var9.onInvTransmit != null && Client.field671 > var9.field2603) {
if (var9.invTransmitTriggers != null && Client.field671 - var9.field2603 <= 32) {
label841:
for (var35 = var9.field2603; var35 < Client.field671; ++var35) {
var23 = Client.field888[var35 & 31];
for (int var35 = var9.field2603; var35 < Client.field671; ++var35) {
int var23 = Client.field888[var35 & 31];
for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
for (int var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
if (var23 == var9.invTransmitTriggers[var36]) {
var31 = new ScriptEvent();
ScriptEvent var31 = new ScriptEvent();
var31.widget = var9;
var31.args = var9.onInvTransmit;
Client.scriptEvents.addFirst(var31);
@@ -482,7 +469,7 @@ final class class2 implements class0 {
}
}
} else {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onInvTransmit;
Client.scriptEvents.addFirst(var29);
@@ -494,12 +481,12 @@ final class class2 implements class0 {
if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2700) {
if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2700 <= 32) {
label817:
for (var35 = var9.field2700; var35 < Client.changedSkillsCount; ++var35) {
var23 = Client.changedSkills[var35 & 31];
for (int var35 = var9.field2700; var35 < Client.changedSkillsCount; ++var35) {
int var23 = Client.changedSkills[var35 & 31];
for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
for (int var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
if (var23 == var9.statTransmitTriggers[var36]) {
var31 = new ScriptEvent();
ScriptEvent var31 = new ScriptEvent();
var31.widget = var9;
var31.args = var9.onStatTransmit;
Client.scriptEvents.addFirst(var31);
@@ -508,7 +495,7 @@ final class class2 implements class0 {
}
}
} else {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onStatTransmit;
Client.scriptEvents.addFirst(var29);
@@ -518,42 +505,42 @@ final class class2 implements class0 {
}
if (Client.chatCycle > var9.field2689 && var9.onChatTransmit != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onChatTransmit;
Client.scriptEvents.addFirst(var29);
}
if (Client.field672 > var9.field2689 && var9.onFriendTransmit != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onFriendTransmit;
Client.scriptEvents.addFirst(var29);
}
if (Client.field849 > var9.field2689 && var9.onClanTransmit != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onClanTransmit;
Client.scriptEvents.addFirst(var29);
}
if (Client.field915 > var9.field2689 && var9.onStockTransmit != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onStockTransmit;
Client.scriptEvents.addFirst(var29);
}
if (Client.field851 > var9.field2689 && var9.field2681 != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.field2681;
Client.scriptEvents.addFirst(var29);
}
if (Client.field844 > var9.field2689 && var9.onMiscTransmit != null) {
var29 = new ScriptEvent();
ScriptEvent var29 = new ScriptEvent();
var29.widget = var9;
var29.args = var9.onMiscTransmit;
Client.scriptEvents.addFirst(var29);
@@ -561,7 +548,7 @@ final class class2 implements class0 {
var9.field2689 = Client.cycleCntr;
if (var9.onKey != null) {
for (var35 = 0; var35 < Client.field754; ++var35) {
for (int var35 = 0; var35 < Client.field754; ++var35) {
ScriptEvent var30 = new ScriptEvent();
var30.widget = var9;
var30.keyTyped = Client.field921[var35];
@@ -621,7 +608,7 @@ final class class2 implements class0 {
}
if (!Client.isMenuOpen) {
GraphicsObject.resetMenuEntries();
GraphicsObject.addCancelMenuEntry();
}
}
@@ -635,10 +622,11 @@ final class class2 implements class0 {
signature = "(I)V",
garbageValue = "-949997341"
)
static final void method28() {
UserComparator10.method3405();
@Export("FriendSystem_invalidateIgnoreds")
static final void FriendSystem_invalidateIgnoreds() {
UserComparator10.Messages_invalidateIgnoreds();
if (DevicePcmPlayerProvider.clanChat != null) {
DevicePcmPlayerProvider.clanChat.clearIgnoreds();
DevicePcmPlayerProvider.clanChat.invalidateIgnoreds();
}
}