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

banktags, cooking, xpdrop, fishing, friendnotes

Browse Source
This commit is contained in:
therealunull
2020-12-16 14:49:04 -05:00
parent 3be6ba5cc0
commit fc1c0799bd
60 changed files with 5217 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runescape-client/src/main/java/Client.java
View File

@@ -3613,9 +3613,9 @@ public final class Client extends GameShell implements Usernamed {
}
}
Widget var35 = EnumDefinition.mousedOverWidgetIf1; // L: 3201
Widget var35 = EnumComposition.mousedOverWidgetIf1; // L: 3201
Widget var37 = CollisionMap.field2092; // L: 3202
EnumDefinition.mousedOverWidgetIf1 = null; // L: 3203
EnumComposition.mousedOverWidgetIf1 = null; // L: 3203
CollisionMap.field2092 = null; // L: 3204
draggedOnWidget = null; // L: 3205
field829 = false; // L: 3206
@@ -3775,13 +3775,13 @@ public final class Client extends GameShell implements Usernamed {
destinationY = var5; // L: 3387
}
if (var35 != EnumDefinition.mousedOverWidgetIf1) { // L: 3389
if (var35 != EnumComposition.mousedOverWidgetIf1) { // L: 3389
if (var35 != null) { // L: 3390
CollisionMap.invalidateWidget(var35);
}
if (EnumDefinition.mousedOverWidgetIf1 != null) { // L: 3391
CollisionMap.invalidateWidget(EnumDefinition.mousedOverWidgetIf1);
if (EnumComposition.mousedOverWidgetIf1 != null) { // L: 3391
CollisionMap.invalidateWidget(EnumComposition.mousedOverWidgetIf1);
}
}
@@ -4036,7 +4036,7 @@ public final class Client extends GameShell implements Usernamed {
}
var4 = WorldMapData_0.field112 * 128 + 64; // L: 3552
var5 = EnumDefinition.field3340 * 128 + 64; // L: 3553
var5 = EnumComposition.field3340 * 128 + 64; // L: 3553
var6 = SecureRandomFuture.getTileHeight(var4, var5, GameObject.Client_plane) - class25.field128; // L: 3554
var7 = var4 - Player.cameraX; // L: 3555
var8 = var6 - KeyHandler.cameraY; // L: 3556
@@ -5347,13 +5347,13 @@ public final class Client extends GameShell implements Usernamed {
if (ServerPacket.field2163 == var1.serverPacket) { // L: 6415
isCameraLocked = true; // L: 6416
WorldMapData_0.field112 = var3.readUnsignedByte(); // L: 6417
EnumDefinition.field3340 = var3.readUnsignedByte(); // L: 6418
EnumComposition.field3340 = var3.readUnsignedByte(); // L: 6418
class25.field128 = var3.readUnsignedShort(); // L: 6419
Players.field1267 = var3.readUnsignedByte(); // L: 6420
ModeWhere.field2405 = var3.readUnsignedByte(); // L: 6421
if (ModeWhere.field2405 >= 100) { // L: 6422
var16 = WorldMapData_0.field112 * 128 + 64; // L: 6423
var5 = EnumDefinition.field3340 * 128 + 64; // L: 6424
var5 = EnumComposition.field3340 * 128 + 64; // L: 6424
var18 = SecureRandomFuture.getTileHeight(var16, var5, GameObject.Client_plane) - class25.field128; // L: 6425
var7 = var16 - Player.cameraX; // L: 6426
var19 = var18 - KeyHandler.cameraY; // L: 6427

4
runescape-client/src/main/java/EnumDefinition.java → runescape-client/src/main/java/EnumComposition.java
View File

@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jx")
@Implements("EnumDefinition")
public class EnumDefinition extends DualNode {
public class EnumComposition extends DualNode {
@ObfuscatedName("rk")
@ObfuscatedGetter(
intValue = 2141868731
@@ -65,7 +65,7 @@ public class EnumDefinition extends DualNode {
EnumDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12
}
EnumDefinition() {
EnumComposition() {
this.defaultStr = "null"; // L: 15
this.outputCount = 0; // L: 17
} // L: 22

10
runescape-client/src/main/java/FontName.java
View File

@@ -287,7 +287,7 @@ public class FontName {
}
if (var10.type == 0) { // L: 9058
if (!var10.isIf3 && DevicePcmPlayerProvider.isComponentHidden(var10) && var10 != EnumDefinition.mousedOverWidgetIf1) { // L: 9059
if (!var10.isIf3 && DevicePcmPlayerProvider.isComponentHidden(var10) && var10 != EnumComposition.mousedOverWidgetIf1) { // L: 9059
continue;
}
@@ -426,12 +426,12 @@ public class FontName {
} else if (var10.type == 3) { // L: 9145
if (class8.runCs1(var10)) { // L: 9147
var19 = var10.color2; // L: 9148
if (var10 == EnumDefinition.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9149
if (var10 == EnumComposition.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9149
var19 = var10.mouseOverColor2;
}
} else {
var19 = var10.color; // L: 9152
if (var10 == EnumDefinition.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9153
if (var10 == EnumComposition.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9153
var19 = var10.mouseOverColor;
}
}
@@ -468,7 +468,7 @@ public class FontName {
String var44 = var10.text; // L: 9182
if (class8.runCs1(var10)) { // L: 9183
var20 = var10.color2; // L: 9184
if (var10 == EnumDefinition.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9185
if (var10 == EnumComposition.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9185
var20 = var10.mouseOverColor2;
}
@@ -477,7 +477,7 @@ public class FontName {
}
} else {
var20 = var10.color; // L: 9189
if (var10 == EnumDefinition.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9190
if (var10 == EnumComposition.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9190
var20 = var10.mouseOverColor;
}
}

6
runescape-client/src/main/java/ItemLayer.java
View File

@@ -86,7 +86,7 @@ public final class ItemLayer
VarcInt.Interpreter_intStackSize -= 2; // L: 1920
var3 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 1921
var9 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]; // L: 1922
EnumDefinition var10 = MusicPatchNode.getEnum(var3); // L: 1923
EnumComposition var10 = MusicPatchNode.getEnum(var3); // L: 1923
if (var10.outputType != 's') { // L: 1924
}
@@ -106,7 +106,7 @@ public final class ItemLayer
} else if (var0 != ScriptOpcodes.ENUM) { // L: 1935
if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 1961
var3 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 1962
EnumDefinition var4 = MusicPatchNode.getEnum(var3); // L: 1963
EnumComposition var4 = MusicPatchNode.getEnum(var3); // L: 1963
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var4.size(); // L: 1964
return 1; // L: 1965
} else {
@@ -118,7 +118,7 @@ public final class ItemLayer
var9 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]; // L: 1938
int var5 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 2]; // L: 1939
var6 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 3]; // L: 1940
EnumDefinition var7 = MusicPatchNode.getEnum(var5); // L: 1941
EnumComposition var7 = MusicPatchNode.getEnum(var5); // L: 1941
if (var3 == var7.inputType && var9 == var7.outputType) { // L: 1942
for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 1947
if (var6 == var7.keys[var8]) { // L: 1948

10
runescape-client/src/main/java/MusicPatchNode.java
View File

@@ -137,18 +137,18 @@ public class MusicPatchNode extends Node {
garbageValue = "-621121394"
)
@Export("getEnum")
public static EnumDefinition getEnum(int var0) {
EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); // L: 29
public static EnumComposition getEnum(int var0) {
EnumComposition var1 = (EnumComposition) EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29
if (var1 != null) { // L: 30
return var1;
} else {
byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); // L: 31
var1 = new EnumDefinition(); // L: 32
byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31
var1 = new EnumComposition(); // L: 32
if (var2 != null) { // L: 33
var1.decode(new Buffer(var2));
}
EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); // L: 34
EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34
return var1; // L: 35
}
}

6
runescape-client/src/main/java/Players.java
View File

@@ -263,7 +263,7 @@ public class Players {
if (DevicePcmPlayerProvider.isComponentHidden(var9)) { // L: 9916
continue;
}
} else if (var9.type == 0 && var9 != EnumDefinition.mousedOverWidgetIf1 && DevicePcmPlayerProvider.isComponentHidden(var9)) { // L: 9919
} else if (var9.type == 0 && var9 != EnumComposition.mousedOverWidgetIf1 && DevicePcmPlayerProvider.isComponentHidden(var9)) { // L: 9919
continue;
}
@@ -749,9 +749,9 @@ public class Players {
if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10328
if (var9.mouseOverRedirect >= 0) { // L: 10329
EnumDefinition.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
EnumComposition.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
} else {
EnumDefinition.mousedOverWidgetIf1 = var9; // L: 10330
EnumComposition.mousedOverWidgetIf1 = var9; // L: 10330
}
}

2
runescape-client/src/main/java/Skeleton.java
View File

@@ -109,7 +109,7 @@ public class Skeleton extends Node {
Widget var3 = var0[var2]; // L: 10597
if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !DevicePcmPlayerProvider.isComponentHidden(var3))) { // L: 10598 10599 10600
if (var3.type == 0) { // L: 10601
if (!var3.isIf3 && DevicePcmPlayerProvider.isComponentHidden(var3) && var3 != EnumDefinition.mousedOverWidgetIf1) { // L: 10602
if (!var3.isIf3 && DevicePcmPlayerProvider.isComponentHidden(var3) && var3 != EnumComposition.mousedOverWidgetIf1) { // L: 10602
continue;
}

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

@@ -123,6 +123,6 @@ public class StructDefinition extends DualNode {
garbageValue = "-890013246"
)
public static void method4545(AbstractArchive var0) {
EnumDefinition.EnumDefinition_archive = var0; // L: 25
EnumComposition.EnumDefinition_archive = var0; // L: 25
} // L: 26
}