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

Rework clanmanmode attack option hiding (#746)

Browse Source 
* A whole bunch of refactoring

* Api/mixins/injector additions for hiding attack options

* Rework clanmanmode attack hiding

* Update Client.java
This commit is contained in:
Lucwousin
2019-06-26 01:01:21 +02:00
committed by Kyleeld
parent ae6274a16f
commit 39a4cb2266
118 changed files with 2038 additions and 1955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
runescape-client/src/main/java/StructDefinition.java
View File

@@ -111,15 +111,15 @@ public class StructDefinition extends DualNode {
Widget var3;
if(var0 >= 2000) {
var0 -= 1000;
var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var3 = Huffman.getWidget(var4);
} else {
var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
}
if(var0 == 1100) {
class179.Interpreter_intStackSize -= 2;
var3.scrollX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
RouteStrategy.Interpreter_intStackSize -= 2;
var3.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
if(var3.scrollX > var3.scrollWidth - var3.width) {
var3.scrollX = var3.scrollWidth - var3.width;
}
@@ -128,7 +128,7 @@ public class StructDefinition extends DualNode {
var3.scrollX = 0;
}
var3.scrollY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var3.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
if(var3.scrollY > var3.scrollHeight - var3.height) {
var3.scrollY = var3.scrollHeight - var3.height;
}
@@ -140,52 +140,52 @@ public class StructDefinition extends DualNode {
class22.method295(var3);
return 1;
} else if(var0 == 1101) {
var3.color = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1102) {
var3.fill = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var3.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var3);
return 1;
} else if(var0 == 1103) {
var3.transparency = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1104) {
var3.lineWid = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1105) {
var3.spriteId2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1106) {
var3.spriteAngle = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1107) {
var3.spriteTiling = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var3.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var3);
return 1;
} else if(var0 == 1108) {
var3.modelType = 1;
var3.modelId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1109) {
class179.Interpreter_intStackSize -= 6;
var3.modelOffsetX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var3.modelOffsetY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var3.modelAngleX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
var3.modelAngleY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
var3.modelAngleZ = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4];
var3.modelZoom = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 5];
RouteStrategy.Interpreter_intStackSize -= 6;
var3.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var3.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var3.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
var3.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
var3.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
var3.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
class22.method295(var3);
return 1;
} else {
int var8;
if(var0 == 1110) {
var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
if(var8 != var3.sequenceId) {
var3.sequenceId = var8;
var3.modelFrame = 0;
@@ -195,7 +195,7 @@ public class StructDefinition extends DualNode {
return 1;
} else if(var0 == 1111) {
var3.modelOrthog = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var3.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var3);
return 1;
} else if(var0 == 1112) {
@@ -207,40 +207,40 @@ public class StructDefinition extends DualNode {
return 1;
} else if(var0 == 1113) {
var3.fontId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1114) {
class179.Interpreter_intStackSize -= 3;
var3.textXAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var3.textYAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var3.textLineHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
RouteStrategy.Interpreter_intStackSize -= 3;
var3.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var3.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var3.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
class22.method295(var3);
return 1;
} else if(var0 == 1115) {
var3.textShadowed = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var3.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var3);
return 1;
} else if(var0 == 1116) {
var3.outline = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1117) {
var3.spriteShadow = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1118) {
var3.spriteFlipV = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var3.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var3);
return 1;
} else if(var0 == 1119) {
var3.spriteFlipH = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var3.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var3);
return 1;
} else if(var0 == 1120) {
class179.Interpreter_intStackSize -= 2;
var3.scrollWidth = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var3.scrollHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
RouteStrategy.Interpreter_intStackSize -= 2;
var3.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var3.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
class22.method295(var3);
if(var4 != -1 && var3.type == 0) {
class39.revalidateWidgetScroll(Widget.widgets[var4 >> 16], var3, false);
@@ -253,19 +253,19 @@ public class StructDefinition extends DualNode {
class22.method295(var3);
return 1;
} else if(var0 == 1122) {
var3.spriteId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1123) {
var3.color2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1124) {
var3.__af = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3.__af = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var3);
return 1;
} else if(var0 == 1125) {
var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
RectangleMode var6 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var8);
if(var6 != null) {
var3.rectangleMode = var6;
@@ -276,11 +276,11 @@ public class StructDefinition extends DualNode {
} else {
boolean var5;
if(var0 == 1126) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
var3.__ba = var5;
return 1;
} else if(var0 == 1127) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
var3.__bv = var5;
return 1;
} else {